diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java index 13a699b..eb621e4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/GeneralApprovalController.java @@ -10,12 +10,10 @@ import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.ApiOperation; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,7 +40,7 @@ @ApiOperation("审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody R request) throws Exception { + public ReturnDTO> approvalListPage(@RequestBody @Valid R request) throws Exception { Page page = PageFactory.defaultPage(); page = baseApprovalService.listPage(page, request); return ReturnUtil.success(super.packForBT(page)); @@ -50,10 +48,8 @@ @ApiOperation("草稿箱-编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid T request) { + return baseApprovalService.draftUpdate(request); } @@ -77,46 +73,33 @@ @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid S request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid S request) { + return baseApprovalService.submit(request); } @ApiOperation("审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return baseApprovalService.approvalRefuse(request); } @ApiOperation("审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return baseApprovalService.approvalRevoke(request); } @ApiOperation("审批-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return baseApprovalService.approvalDelete(request); } @ApiOperation("未通过/已取消-编辑（驳回后的重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid T request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid T request) { return baseApprovalService.failUpdate(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java index d775831..6f2b30e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateChangeApplyController.java @@ -6,15 +6,12 @@ import com.casic.missiles.dto.business.certificate.CertificateChangeApplyApprovalListRequest; import com.casic.missiles.dto.business.certificate.CertificateChangeApplySaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateChangeApply; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessCertificateChangeApplyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -44,10 +41,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessCertificateChangeApply request) { return changeApplyService.saveChangeApply(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java index af8230e..60b06a4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificatePrintController.java @@ -48,10 +48,8 @@ @ApiOperation("证书打印审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid CertificatePrintApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = certificatePrintService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -59,19 +57,15 @@ @ApiOperation("证书打印审批提交") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificatePrintService.submit(request); } @ApiOperation("证书打印审批详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return certificatePrintService.detail(request); } @@ -81,10 +75,8 @@ @ApiOperation("证书打印审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return certificatePrintService.approvalRefuse(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java index 6b2efd5..9210929 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessCertificateReportController.java @@ -1,11 +1,12 @@ package com.casic.missiles.controller.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.BaseDetailRequest; import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportSaveResponse; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessCertificateReport; @@ -43,21 +44,23 @@ super(baseApprovalService); } + @ApiOperation("提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") + @PostMapping("/submit") + public ReturnDTO submit(@RequestBody @Valid BaseApprovalSubmitRequest request) { + return certificateReportService.submit(request); + } + @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessCertificateReport request) { + return certificateReportService.saveCertificateReport(request); } @ApiOperation("详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return certificateReportService.detail(request); } @@ -68,4 +71,16 @@ super.exportExcel(BizBusinessCertificateReport.class, list, ExportEnum.CERTIFICATE_REPORT.getSheetName()); } + @ApiOperation("根据样品id/客户id查询检定证书") + @PostMapping("/certificateRecordsById") + public ReturnDTO> certificationBySampleId(@RequestBody CertificateRecordRequest certificateRecordRequest) { + return ReturnUtil.success(super.packForBT(certificateReportService.certificateRecordsById(certificateRecordRequest))); + } + + @ApiOperation("根据样品id查询证书监控列表") + @PostMapping("/certificateMonitorsById") + public ReturnDTO certificateMonitorsById(@RequestBody CertificateMonitorRequest certificateMonitorRequest) { + return ReturnUtil.success(certificateReportService.certificateMonitorsById(certificateMonitorRequest)); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java index 57c0809..4b21c5e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessIdentifyInfoController.java @@ -13,15 +13,16 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessIdentifyInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessIdentifyInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.List; @@ -51,10 +52,7 @@ @ApiOperation("标识打印新增") @PostMapping("/add") - public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addIdentify(@RequestBody @Valid BizBusinessIdentifyInfo identifyInfo) { return identifyInfoService.addIdentify(identifyInfo); } @@ -78,10 +76,8 @@ @ApiOperation("标识打印导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid IdentifyListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid IdentifyListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = identifyInfoService.listByIds(request.getIds()); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java index cb5e78a..2c828a3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOrderInfoController.java @@ -19,13 +19,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessOrderInfoService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -51,10 +49,8 @@ @ApiOperation("任务单列表（分页）") @PostMapping("/listPage") - public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> orderListPage(@RequestBody @Valid OrderListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(businessOrderService.orderListPage(page, request))); } @@ -79,22 +75,16 @@ @ApiOperation("任务单新增") @PostMapping("/add") - public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO orderAdd(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { return businessOrderService.addOrder(businessOrder); } @ApiOperation("任务单更新") @PostMapping("/update") - public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder, BindingResult bindingResult) { + public ReturnDTO orderUpdate(@RequestBody @Valid BizBusinessOrderInfo businessOrder) { Assert.isFalse(Objects.isNull(businessOrder.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); return businessOrderService.updateOrder(businessOrder); } @@ -121,10 +111,8 @@ */ @ApiOperation("任务单内设备补送/退回") @PostMapping("/sample/apply") - public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO sampleApply(@RequestBody @Valid OrderSampleApplyRequest sampleApplyRequest) { + return businessOrderService.sampleApplyRequest(sampleApplyRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java index a2f7afb..4c5409d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceAssessController.java @@ -7,9 +7,7 @@ import com.casic.missiles.dto.business.outsource.OutsourceAssessApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceAssessSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceAssess; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceAssessService; import io.swagger.annotations.Api; @@ -46,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceAssess request) { return outsourceAssessService.saveOutsourceAssess(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java index 5888dda..3c35ec5 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceNoticeController.java @@ -46,19 +46,15 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceNotice request) { + return outsourceNoticeService.saveOutsourceNotice(request); } @ApiOperation("分包通知书编辑（发送给受检单位人员，即编辑受检单位(委托方)用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizBusinessOutsourceNotice outsourceNotice) { + return outsourceNoticeService.noticeUpdate(outsourceNotice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java index 9587d17..3cf568b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourceProtocolController.java @@ -7,15 +7,12 @@ import com.casic.missiles.dto.business.outsource.OutsourceProtocolApprovalListRequest; import com.casic.missiles.dto.business.outsource.OutsourceProtocolSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOutsourceProtocol; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessOutsourceProtocolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,10 +43,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO saveCertificateReport(@RequestBody @Valid BizBusinessOutsourceProtocol request) { return outsourceProtocolService.saveOutsourceProtocol(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java index e26d052..b29ad8a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessOutsourcerInfoController.java @@ -52,10 +52,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessOutsourcerInfo request) { return outsourcerInfoService.saveOutsourcer(request); } @@ -91,10 +88,8 @@ @ApiOperation("分包方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List userInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List userInfoList) { + return outsourcerInfoService.personAdd(userInfoList); } @@ -123,10 +118,8 @@ @ApiOperation("分包方业务能力新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List abilityInfoList) { + return outsourcerInfoService.abilityAdd(abilityInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java index 0410918..427af81 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveInfoController.java @@ -14,13 +14,11 @@ import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessSiteExecutiveInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.business.IBizBusinessSiteExecutiveInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -51,10 +49,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizBusinessSiteExecutiveInfo siteExecutiveInfo) { + return siteExecutiveInfoService.saveSiteExecutiveInfo(siteExecutiveInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java index 9ff5051..800fc4b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BizBusinessSiteExecutiveLogController.java @@ -47,20 +47,16 @@ @ApiOperation("现场检测记录表列表（分页）") @PostMapping("/listPage") - public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) throws Exception { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(siteExecutiveLogService.listPage(page, request))); } @ApiOperation("现场检测记录表新增") @PostMapping("/add") - public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog siteExecutiveLog) { + return siteExecutiveLogService.addSiteExecutiveLog(siteExecutiveLog); } @@ -76,13 +72,11 @@ @ApiOperation("现场检测记录表更新") @PostMapping("/update") - public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog, BindingResult bindingResult) { + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BizBusinessSiteExecutiveLog BizBusinessSiteExecutiveLog) { Assert.isFalse(Objects.isNull(BizBusinessSiteExecutiveLog.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return siteExecutiveLogService.updateSiteExecutiveLog(BizBusinessSiteExecutiveLog); } 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 a92e209..17aacd0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -13,7 +13,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.eqpt.EqptEquipmentInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.eqpt.IEqptEquipmentInfoService; import io.swagger.annotations.Api; @@ -21,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,10 +43,7 @@ @ApiOperation("设备收发列表（分页）") @PostMapping("/listPage") - public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO> listPage(@RequestBody @Valid SampleDispatchListRequest request) { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(dispatchService.listPage(page, request))); } @@ -83,10 +78,8 @@ */ @ApiOperation("(回退、收入、归还、无需检测按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList) { + return dispatchService.batchStatusChange(deviceReceiveDTOList); } @@ -95,19 +88,15 @@ */ @ApiOperation("完成/终止按钮") @PostMapping("/terminate") - public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO forcedTerminate(@RequestBody @Valid List deviceReceiveDTO) { + return dispatchService.forcedTerminate(deviceReceiveDTO); } @ApiOperation("设备批量改变状态") @PostMapping("/status/batchChange") - public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO statusBatchChange(@RequestBody @Valid DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { + return ReturnUtil.success(dispatchService.statusBatchChange(deviceBatchStatusChangeDTO)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java index b4551e0..a743716 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDistributeController.java @@ -8,14 +8,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,12 +33,9 @@ /** * 任务分发-查询各状态列表（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态列表") + @ApiOperation("查询各状态列表") @PostMapping("/handOut/list") - public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryHandOutList(@RequestBody @Valid SampleHandOutListRequest handOutListRequest) throws Exception { DictCodeUtils.validDictCode(handOutListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.handOutListPage(page, handOutListRequest))); @@ -50,7 +44,7 @@ /** * 任务分发-查询各状态样品数量（待分发、检测中、检测完、已超期） */ - @ApiOperation("任务分发-查询各状态样品数量") + @ApiOperation("查询各状态样品数量") @GetMapping("/handOut/amount") public ReturnDTO> queryHandOutAmount() { return ReturnUtil.success(labExecutiveInfoService.handOutAmount()); @@ -64,48 +58,39 @@ /** * 任务分发-详情 */ - @ApiOperation("任务分发-详情-检定信息（底部证书检定查询证书报告中接口）") + @ApiOperation("详情-检定信息（底部证书检定查询证书报告中接口）") @PostMapping("/handOut/detail") - public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO queryHandOutDetail(@RequestBody @Valid SampleHandOutDetailRequest handOutDetailRequest) throws Exception { return ReturnUtil.success(labExecutiveInfoService.handOutListDetail(handOutDetailRequest)); } /** * 任务分发-获取初始化检定流程（实验室列表） */ - @ApiOperation("任务分发-获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") + @ApiOperation("获取初始化检定流程（自动分发也需要分发员点击分发后进行分发）") @PostMapping("/handOut/initList") - public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryInitList(@RequestBody @Valid SampleHandOutInitListRequest handOutInitListRequest) { return ReturnUtil.success(labExecutiveInfoService.handOutInitList(handOutInitListRequest)); } - /** - * 任务分发-分发 - */ - @ApiOperation("任务分发-分发") + @ApiOperation("分发") @PostMapping("/handOut/execute") - public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO handOut(@RequestBody @Valid SampleHandOutRequest handOutRequest) { return labExecutiveInfoService.handOut(handOutRequest); } /** - * 各状态列表导出 + * 任务分发-批量分发，只选择一个检定节点分发给多个设备 */ - @ApiOperation("任务分发-各状态列表导出") + @ApiOperation("批量分发") + @PostMapping("/handOut/batch/execute") + public ReturnDTO handOut(@RequestBody @Valid List handOutBatchRequest) { + return labExecutiveInfoService.handOutBatch(handOutBatchRequest); + } + + @ApiOperation("各状态列表导出") @PostMapping("/handOut/listExport") - public void export(@RequestBody @Valid SampleHandOutListRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SampleHandOutListRequest request) throws Exception { Page page = PageFactory.defaultPage(); page.setCurrent(1); page.setSearchCount(false); 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 8b9d79d..57ff6db 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 @@ -9,15 +9,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BizBusinessInterchangeInfo; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBizBusinessInterchangeInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,24 +54,28 @@ return ReturnUtil.success(interchangeInfoService.interchangeDetail(idDTO.getId())); } + @ApiOperation("样品列表（交接单页面）") + @PostMapping("/listPageByInterchange") + public ReturnDTO> listPageByInterchange(@RequestBody @Valid InterchangeSampleListRequest request) throws Exception { + + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(interchangeInfoService.sampleListPage(page, request))); + } + @ApiOperation("设备交接单新增") @PostMapping("/add") - public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + public ReturnDTO addInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { + return interchangeInfoService.addInterchange(interchangeInfo); } @ApiOperation("设备交接单更新(暂定只可以更新交接单，样品明细不可动)") @PostMapping("/update") - public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo, BindingResult bindingResult) { + public ReturnDTO updateInterchange(@RequestBody @Valid BizBusinessInterchangeInfo interchangeInfo) { Assert.isFalse(Objects.isNull(interchangeInfo.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); + return interchangeInfoService.updateInterchange(interchangeInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java index d120fd4..3a270db 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessTaskMeasureController.java @@ -8,15 +8,12 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.labExecutive.*; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -36,10 +33,7 @@ @ApiOperation("实验室任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/deptExecutive/List") - public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryDeptExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.deptLabExecutiveListPage(page, labExecutiveListRequest))); @@ -59,10 +53,7 @@ @ApiOperation("我的任务-查询各状态列表（待检测、检测中、检测完）") @PostMapping("/myExecutive/list") - public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> queryMyExecutiveList(@RequestBody @Valid SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception { DictCodeUtils.validDictCode(labExecutiveListRequest); Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(labExecutiveInfoService.myLabExecutiveListPage(page, labExecutiveListRequest))); @@ -88,46 +79,36 @@ @ApiOperation("实验室任务-分配按钮（分配给具体人员）") @PostMapping("/deptExecutive/allocate") - public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO allocateStaff(@RequestBody @Valid SampleAllocateRequest sampleAllocateRequest) { + return labExecutiveInfoService.allocateStaff(sampleAllocateRequest); } @ApiOperation("我的任务-检定人扫描收入（待检测->检测中）") @PostMapping("/myExecutive/receive") - public ReturnDTO sampleReceive(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleReceive(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleReceive(requestList); } @ApiOperation("实验室任务-负责人/检定人扫描检完（检测中->检测完）") @PostMapping("/myExecutive/complete") - public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sampleExecutiveComplete(@RequestBody @Valid List requestList) { + return labExecutiveInfoService.sampleExecutiveComplete(requestList); } @ApiOperation("实验室任务/我的任务 编辑（只能修改应出具证书）") @PostMapping("/executive/update") - public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutive(@RequestBody @Valid UpdateExecutiveRequest request) { + return labExecutiveInfoService.updateExecutive(request); } @ApiOperation("实验室任务/我的任务 详情") @PostMapping("/executive/detail") - public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request, BindingResult bindingResult) throws Exception { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveDetail(@RequestBody @Valid ExecutiveDetailRequest request) throws Exception { + return ReturnUtil.success(labExecutiveInfoService.executiveDetail(request)); } @@ -138,19 +119,15 @@ */ @ApiOperation("实验室任务/我的任务 退回（待检测/检测中->退回）") @PostMapping("/executive/sendBack") - public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO executiveSendBack(@RequestBody @Valid ExecutiveSendBackRequest request) { + return labExecutiveInfoService.sampleExecutiveSendBack(request); } @ApiOperation("分发员编辑实验室检测列表") @PostMapping("/handOut/updateList") - public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateExecutiveList(@RequestBody @Valid UpdateExecutiveListRequest request) { + return labExecutiveInfoService.updateExecutiveList(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java new file mode 100644 index 0000000..81deb17 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizBusinessEquipmentStatusLogController.java @@ -0,0 +1,36 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.casic.missiles.service.equipment.IBizBusinessEquipmentStatusLogService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "状态变更记录") +@RestController +@RequestMapping("/equipment/status/log") +public class BizBusinessEquipmentStatusLogController { + @Autowired + private IBizBusinessEquipmentStatusLogService statusLogService; + + @ApiOperation("查询设备状态变更记录") + @GetMapping("/list") + public ReturnDTO> list(Long equipmentId) throws Exception { + return ReturnUtil.success(statusLogService.listByEquipment(equipmentId)); + } +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java new file mode 100644 index 0000000..c380895 --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardBuildController.java @@ -0,0 +1,62 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStandardSaveResponse; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardBuildUpdateCertificateRequest; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardBuildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准建立") +@RestController +@RequestMapping("/equipment/standardBuild") +public class BizEquipmentStandardBuildController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardBuildService standardBuildService; + + public BizEquipmentStandardBuildController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardBuild request) { + return standardBuildService.saveStandardBuild(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardBuildService.detail(request); + } + + @ApiOperation("上传标准证书") + @PostMapping("/updateCertificate") + public ReturnDTO updateCertificate(@RequestBody @Valid StandardBuildUpdateCertificateRequest request) { + return standardBuildService.updateCertificate(request); + } + + // TODO: 2023/8/31 详情-文档预览 + // 产品：标准文档模板：能按模版生成文件封面，有领导签名，直接打印出来，用于装订；除了标准文档模版，还有技术文件、体系文件模版。我还没收集全 +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java index 91de54b..da9c825 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardInfoController.java @@ -11,14 +11,15 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.*; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -50,10 +51,8 @@ @ApiOperation("标准装置列表审批列表（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid StandardApprovalListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = standardInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -62,19 +61,15 @@ @ApiOperation("标准装置保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.save(request); } @ApiOperation("标准装置草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid StandardAddRequest request) { + return standardInfoService.draftUpdate(request); } @@ -98,19 +93,13 @@ @ApiOperation("标准装置提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { return standardInfoService.submit(request); } @ApiOperation("标准装置详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { return standardInfoService.detail(request); } @@ -120,47 +109,32 @@ @ApiOperation("标准装置审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { return standardInfoService.approvalRefuse(request); } @ApiOperation("标准装置审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { return standardInfoService.approvalRevoke(request); } @ApiOperation("标准装置审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { return standardInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消标准装置编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid StandardAddRequest request) { return standardInfoService.failUpdate(request); } //查询设备表 @ApiOperation("详情-标准配套设备列表（分页）") @PostMapping("/equipment/listPage") - public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> equipmentListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.standardEquipmentListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -187,10 +161,8 @@ @ApiOperation("详情-计量人员列表（分页）") @PostMapping("/staff/listPage") - public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> standardStaffListPage(@RequestBody @Valid StandardEquipmentAndStaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = staffRelationService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java new file mode 100644 index 0000000..101a7dd --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStandardStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.dto.equipment.StandardStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStandardStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-标准装置状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +@Api(tags = "标准装置状态维护") +@RestController +@RequestMapping("/standard/status") +public class BizEquipmentStandardStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStandardStatusService standardStatusService; + + public BizEquipmentStandardStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStandardStatus request) { + return standardStatusService.saveStandardStatus(request); + } + + @ApiOperation("详情") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return standardStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java new file mode 100644 index 0000000..5317f9e --- /dev/null +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentStatusController.java @@ -0,0 +1,55 @@ +package com.casic.missiles.controller.equipment; + +import com.casic.missiles.controller.GeneralApprovalController; +import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.BaseDetailRequest; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusDetailResponse; +import com.casic.missiles.dto.equipment.EquipmentStatusSaveResponse; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import com.casic.missiles.service.IGeneralApprovalService; +import com.casic.missiles.service.equipment.IBizEquipmentStatusService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + *

+ * 设备与装置-设备状态维护 前端控制器 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +@Api(tags = "设备状态维护") +@RestController +@RequestMapping("/equipment/status") +public class BizEquipmentStatusController extends GeneralApprovalController { + @Autowired + private IBizEquipmentStatusService equipmentStatusService; + + public BizEquipmentStatusController(IGeneralApprovalService baseApprovalService) { + super(baseApprovalService); + } + + @ApiOperation("草稿箱-保存") + @PostMapping("/save") + public ReturnDTO saveEquipmentStatus(@RequestBody @Valid BizEquipmentStatus request) { + return equipmentStatusService.saveEquipmentStatus(request); + } + + @ApiOperation("详情（基本信息）") + @PostMapping("/detail") + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) { + return equipmentStatusService.detail(request); + } + +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java index 6591f16..9316ed0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentInfoController.java @@ -41,10 +41,7 @@ @ApiOperation("设备列表审批列表及详情中基础信息（分页）") @PostMapping("/approval/listPage") - public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> approvalListPage(@RequestBody @Valid EquipmentApprovalListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = equipmentInfoService.approvalListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -52,19 +49,15 @@ @ApiOperation("设备保存至草稿箱") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.save(request); } @ApiOperation("设备草稿箱编辑") @PostMapping("/draftUpdate") - public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO draftUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.draftUpdate(request); } @@ -88,19 +81,15 @@ @ApiOperation("设备提交（未调用过保存接口保存至草稿箱需先调用保存接口，再调用该接口；无基本信息变更时changeFlag传1）") @PostMapping("/submit") - public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO submit(@RequestBody @Valid EquipmentApprovalSubmitRequest request) { + return equipmentInfoService.submit(request); } @ApiOperation("设备详情（基本信息）") @PostMapping("/detail") - public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid BaseDetailRequest request) throws Exception { + return equipmentInfoService.detail(request); } @@ -110,46 +99,36 @@ @ApiOperation("设备审批-拒绝") @PostMapping("/approval/refuse") - public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRefuse(@RequestBody @Valid BaseApprovalRefuseRequest request) { + return equipmentInfoService.approvalRefuse(request); } @ApiOperation("设备审批-取消（发起者撤回，表单状态更改为已取消，仅审批中状态可撤回）") @PostMapping("/approval/revoke") - public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO approvalRevoke(@RequestBody @Valid BaseApprovalRevokeRequest request) { + return equipmentInfoService.approvalRevoke(request); } @ApiOperation("设备审批操作-删除（已取消删除，发起者或具有删除权限的用户可以删除，已通过/未通过状态不可删除，前端控制按钮权限）") @PostMapping("/approval/delete") - public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid ApprovalDeleteRequest request) { + return equipmentInfoService.approvalDelete(request); } @ApiOperation("未通过/已取消设备编辑（驳回后的设备重新编辑）") @PostMapping("/failUpdate") - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO failUpdate(@RequestBody @Valid EquipmentAddRequest request) { + return equipmentInfoService.failUpdate(request); } @ApiOperation("设备流转日志（分页）") @PostMapping("/circulationLog/listPage") - public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> circulationLogListPage(@RequestBody @Valid EquipmentCirculationLogRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = circulationLogService.circulationLogListPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java index ab48c49..f5a13dc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/flowable/ApprovalOperateController.java @@ -3,10 +3,10 @@ import cn.hutool.core.lang.Assert; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.flowable.*; +import com.casic.missiles.dto.flowable.ApprovalAgreeRequest; +import com.casic.missiles.dto.flowable.ApprovalLogResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.flowable.ApprovalOperateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -59,10 +59,7 @@ @ApiOperation("审批操作-同意") @PostMapping("/agree") @ResponseBody - public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO agree(@RequestBody @Valid ApprovalAgreeRequest request) { return approvalOperateService.agree(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java index 4ce6421..87de7be 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerExamineFormController.java @@ -6,8 +6,6 @@ import com.casic.missiles.dto.resource.customer.ExamineFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.ExamineFormSaveResponse; import com.casic.missiles.dto.resource.customer.ExamineFormSendToRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerExamineForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerExamineFormService; @@ -43,19 +41,13 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerExamineForm request) { return examineFormService.saveExamineForm(request); } @ApiOperation("发送给委托方按钮，前端下拉选择委托方deptId的一个用户userId") @PostMapping("/sendTo") - public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sendTo(@RequestBody @Valid ExamineFormSendToRequest request) { return examineFormService.sendTo(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java index 0c04f31..a9c9eda 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerInfoController.java @@ -50,10 +50,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerInfo request) { return customerInfoService.saveCustomerInfo(request); } @@ -74,10 +71,8 @@ @ApiOperation("委托方人员新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody BizResourceCustomerStaff customerStaff) { + return customerInfoService.personAdd(customerStaff); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 4e95bbf..ee76233 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.customer.CustomerQuestionnaireListRequest; import com.casic.missiles.dto.resource.customer.QuestionnaireSendRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerQuestionnaire; import com.casic.missiles.service.resource.IBizResourceCustomerQuestionnaireService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -37,10 +37,7 @@ @ApiOperation("委托方满意度调查表列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> questionnaireListPage(@RequestBody @Valid CustomerQuestionnaireListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = questionnaireService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,13 @@ @ApiOperation("委托方满意度调查表新增") @PostMapping("/add") - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { return questionnaireService.questionnaireAdd(questionnaire); } @ApiOperation("委托方满意度调查表发送通知") @PostMapping("/send") - public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO questionnaireSend(@RequestBody @Valid QuestionnaireSendRequest request) { return questionnaireService.questionnaireSend(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java index 8cfa23c..0462b88 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerResultReviewNoticeController.java @@ -5,23 +5,23 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; -import com.casic.missiles.dto.IdDTO; -import com.casic.missiles.dto.IdsDTO; -import com.casic.missiles.dto.ReturnDTO; -import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.*; import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeListRequest; +import com.casic.missiles.dto.resource.customer.CustomerResultReviewNoticeSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerResultReviewNotice; import com.casic.missiles.service.resource.IBizResourceCustomerResultReviewNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; /** @@ -42,10 +42,7 @@ @ApiOperation("检测结果复查通知单列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> noticeListPage(@RequestBody @Valid CustomerResultReviewNoticeListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = resultReviewNoticeService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -53,19 +50,13 @@ @ApiOperation("检测结果复查通知单新增") @PostMapping("/add") - public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeAdd(resultReviewNotice); } @ApiOperation("检测结果复查通知单编辑（发送给受检单位人员，即编辑委托方及委托方用户信息字段）") @PostMapping("/update") - public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid BizResourceCustomerResultReviewNotice resultReviewNotice) { return resultReviewNoticeService.noticeUpdate(resultReviewNotice); } @@ -83,4 +74,10 @@ }); return resultReviewNoticeService.deleteBatchNotice(idsDTO.getIds()); } + + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + resultReviewNoticeService.exportFile(exportDTO, response); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java index f1b3445..c126b5b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSituationReportController.java @@ -13,7 +13,6 @@ import com.casic.missiles.dto.resource.customer.SituationReportCustomerListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSituationReport; import com.casic.missiles.service.resource.IBizResourceCustomerSituationReportService; import io.swagger.annotations.Api; @@ -21,7 +20,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; import java.util.Objects; @@ -44,10 +46,7 @@ @ApiOperation("委托方情况报告列表&详情基本信息（分页）") @PostMapping("/listPage") - public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> reportListPage(@RequestBody @Valid CustomerSituationReportListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = situationReportService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -64,19 +63,13 @@ @ApiOperation("委托方情况报告新增") @PostMapping("/add") - public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportAdd(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportAdd(situationReport); } @ApiOperation("委托方情况报告编辑") @PostMapping("/update") - public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO reportUpdate(@RequestBody @Valid BizResourceCustomerSituationReport situationReport) { return situationReportService.reportUpdate(situationReport); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java index 6418ea5..19282c6 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerSuggestFormController.java @@ -2,24 +2,23 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.resource.customer.SuggestFormApprovalListRequest; import com.casic.missiles.dto.resource.customer.SuggestFormSaveResponse; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceCustomerSuggestForm; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.resource.IBizResourceCustomerSuggestFormService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -45,10 +44,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceCustomerSuggestForm request) { return suggestFormService.saveSuggestForm(request); } @@ -59,4 +55,10 @@ super.exportExcel(BizResourceCustomerSuggestForm.class, list, ExportEnum.CUSTOMER_SUGGEST_FORM.getSheetName()); } + @ApiOperation("导出word/pdf") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + suggestFormService.exportFile(exportDTO, response); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java index 9e07eab..e705d4d 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceEnvController.java @@ -55,10 +55,8 @@ @ApiOperation("环境记录单数据导出") @PostMapping("/data/export") - public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void environmentRecordDataExport(@RequestBody @Valid EnvironmentRecordDataListRequest request) throws Exception { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = environmentRecordDataService.dataListByIds(request.getIds()); @@ -77,19 +75,15 @@ @ApiOperation("环境记录单配置批量新增") @PostMapping("/config/batchAdd") - public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigBatchAdd(@RequestBody List configList) { + return environmentRecordConfigService.addBatchEnvironmentRecordConfig(configList); } @ApiOperation("环境记录单配置编辑（编辑哪些记录地点就传哪些记录地点及对应记录时间列表）") @PostMapping("/config/update") - public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO environmentRecordConfigUpdate(@RequestBody List configList) { + return environmentRecordConfigService.updateEnvironmentRecordConfig(configList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java index 6bbfdea..d488f8f 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceMeterFileController.java @@ -37,10 +37,7 @@ @ApiOperation("计量资料列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid MeterFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = meterFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -48,19 +45,15 @@ @ApiOperation("计量资料新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileAdd(meterFile); } @ApiOperation("计量资料编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceMeterFile meterFile) { + return meterFileService.fileUpdate(meterFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java index 3465c3e..ae9a303 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealInfoController.java @@ -40,10 +40,8 @@ @ApiOperation("印章管理登记列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealInfoListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -51,19 +49,15 @@ @ApiOperation("印章管理登记新增") @PostMapping("/add") - public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealAdd(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealAdd(sealInfo); } @ApiOperation("印章管理登记编辑") @PostMapping("/update") - public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO sealUpdate(@RequestBody @Valid BizResourceSealInfo sealInfo) { + return sealInfoService.sealUpdate(sealInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java index e9561fa..bd9bf3b 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSealNoteController.java @@ -53,10 +53,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSealUseNote request) { + return sealUseNoteService.saveSeal(request); } @@ -71,10 +69,8 @@ @ApiOperation("印章使用日志列表（分页）") @PostMapping("/log/listPage") - public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> sealListPage(@RequestBody @Valid SealLogListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = sealUseLogService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java index 34d43a3..4686c20 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffAuthorizeOrderController.java @@ -42,10 +42,8 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceAuthorizeOrder request) { + return authorizeOrderService.saveAuthorizeOrder(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java index fbe341a..feb4721 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceStaffInfoController.java @@ -49,10 +49,8 @@ @ApiOperation("人员登记列表&基础信息（分页）") @PostMapping("/listPage") - public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> staffListPage(@RequestBody @Valid StaffListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(staffInfoService.listPage(page, request))); } @@ -118,10 +116,8 @@ @ApiOperation("科研教育批量新增") @PostMapping("/education/batchAdd") - public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO educationBatchAdd(@RequestBody @Valid List staffEducationList) { + return staffInfoService.educationBatchAdd(staffEducationList); } @@ -165,10 +161,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/batchAdd") - public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityBatchAdd(@RequestBody @Valid List staffAbilityList) { + return staffInfoService.abilityBatchAdd(staffAbilityList); } @@ -212,10 +206,8 @@ @ApiOperation("科研项目批量新增") @PostMapping("/project/batchAdd") - public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO projectBatchAdd(@RequestBody @Valid List staffProjectList) { + return staffInfoService.projectBatchAdd(staffProjectList); } @@ -259,10 +251,8 @@ @ApiOperation("授权信息批量新增") @PostMapping("/authorize/batchAdd") - public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO authorizeBatchAdd(@RequestBody @Valid List staffAuthorizeList) { + return staffInfoService.authorizeBatchAdd(staffAuthorizeList); } @@ -306,10 +296,8 @@ @ApiOperation("经验履历批量新增") @PostMapping("/resume/batchAdd") - public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO resumeBatchAdd(@RequestBody @Valid List staffResumeList) { + return staffInfoService.resumeBatchAdd(staffResumeList); } @@ -353,10 +341,8 @@ @ApiOperation("晋升情况批量新增") @PostMapping("/promote/batchAdd") - public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO promoteBatchAdd(@RequestBody @Valid List staffPromoteList) { + return staffInfoService.promoteBatchAdd(staffPromoteList); } @@ -400,10 +386,8 @@ @ApiOperation("检定员证书批量新增") @PostMapping("/verifier/batchAdd") - public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO verifierBatchAdd(@RequestBody @Valid List staffVerifierList) { + return staffInfoService.verifierBatchAdd(staffVerifierList); } @@ -433,10 +417,8 @@ @ApiOperation("训练登记表&详情基础信息（分页）") @PostMapping("/train/listPage") - public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> trainListPage(@RequestBody @Valid TrainListRequest request) throws Exception { + Page page = PageFactory.defaultPage(); Page responsePage = trainInfoService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java index cd09c1e..7887c6a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSupplierInfoController.java @@ -53,10 +53,7 @@ @ApiOperation("草稿箱-保存") @PostMapping("/save") - public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO save(@RequestBody @Valid BizResourceSupplierInfo request) { return supplierInfoService.saveSupplier(request); } @@ -94,10 +91,8 @@ @ApiOperation("供方人员批量新增") @PostMapping("/person/add") - public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO personAdd(@RequestBody @Valid List supplierPersonList) { + return supplierInfoService.personAdd(supplierPersonList); } @@ -128,10 +123,8 @@ @ApiOperation("业务能力批量新增") @PostMapping("/ability/add") - public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO abilityAdd(@RequestBody @Valid List supplierAbilityList) { + return supplierInfoService.abilityAdd(supplierAbilityList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java index b8b5c24..1f5ca70 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java @@ -8,15 +8,15 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.resource.file.SystemFileListRequest; -import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.resource.BizResourceSystemFile; import com.casic.missiles.service.resource.IBizResourceSystemFileService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.validation.Valid; @@ -39,10 +39,7 @@ @ApiOperation("体系文件/历史文件列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid SystemFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); Page responsePage = systemFileService.listPage(page, request); return ReturnUtil.success(super.packForBT(responsePage)); @@ -50,19 +47,14 @@ @ApiOperation("体系文件/历史文件新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceSystemFile systemFile) { return systemFileService.fileAdd(systemFile); } @ApiOperation("体系文件/历史文件编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) { + return systemFileService.fileUpdate(systemFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java index 6176c6d..6373666 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceTechniqueFileController.java @@ -37,29 +37,22 @@ @ApiOperation("现行测试校准检定方法列表&详情（分页）") @PostMapping("/listPage") - public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request, BindingResult bindingResult) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> fileListPage(@RequestBody @Valid TechniqueFileListRequest request) throws Exception { Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(techniqueFileService.listPage(page, request))); } @ApiOperation("现行测试校准检定方法新增") @PostMapping("/add") - public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileAdd(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileAdd(techniqueFile); } @ApiOperation("现行测试校准检定方法编辑") @PostMapping("/update") - public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceTechniqueFile techniqueFile) { + return techniqueFileService.fileUpdate(techniqueFile); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java index 97e30b1..78f4fc4 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java @@ -24,7 +24,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.RequestValidException; import com.casic.missiles.model.exception.ServiceException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.log.LogObjectHolder; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; @@ -89,10 +88,8 @@ @ApiOperation("签名列表（分页）") @PostMapping("/sign/listPage") @ResponseBody - public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signListPage(@RequestBody @Valid SignListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(signService.listPage(page, request))); } @@ -110,20 +107,16 @@ @ApiOperation("签名列表") @PostMapping("/sign/list") @ResponseBody - public ReturnDTO> signList(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> signList(@RequestBody @Valid SignListRequest request) { + return ReturnUtil.success(signService.list(request)); } @ApiOperation("签名导出") @PostMapping("/sign/listExport") @ResponseBody - public void export(@RequestBody @Valid SignListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid SignListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = signService.listByIds(request.getIds()); @@ -136,20 +129,16 @@ @ApiOperation("签名新建") @PostMapping("/sign/add") @ResponseBody - public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signAdd(@RequestBody @Valid SignAddRequest request) { + return signService.addSign(request); } @ApiOperation("签名更新") @PostMapping("/sign/update") @ResponseBody - public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO signUpdate(@RequestBody @Valid SystemSign systemSign) { + return signService.updateSign(systemSign); } @@ -183,10 +172,8 @@ @ApiOperation("文件模板管理-文件管理模板列表（分页）（原始记录/证书报告/核查记录等）") @PostMapping("/template/listPage") @ResponseBody - public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateListPage(@RequestBody @Valid TemplateListRequest request) { + Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(templateService.listPage(page, request))); } @@ -204,20 +191,16 @@ @ApiOperation("文件模板管理-文件管理模板列表") @PostMapping("/template/list") @ResponseBody - public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> templateList(@RequestBody @Valid TemplateListRequest request) { + return ReturnUtil.success(templateService.list(request)); } @ApiOperation("文件模板管理-文件管理模板导出") @PostMapping("/template/listExport") @ResponseBody - public void export(@RequestBody @Valid TemplateListRequest request, BindingResult bindingResult) throws IOException { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid TemplateListRequest request) throws IOException { + List list; if (!CollectionUtils.isEmpty(request.getIds())) { list = templateService.listByIds(request.getIds()); @@ -230,20 +213,16 @@ @ApiOperation("文件模板管理-文件管理模板新建") @PostMapping("/template/add") @ResponseBody - public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateAdd(@RequestBody @Valid TemplateAddRequest request) { + return templateService.addTemplate(request); } @ApiOperation("文件模板管理-文件管理模板更新") @PostMapping("/template/update") @ResponseBody - public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO templateUpdate(@RequestBody @Valid SystemTemplate systemTemplate) { + return templateService.updateTemplate(systemTemplate); } @@ -278,20 +257,16 @@ @ApiOperation("通知公告新建") @PostMapping("/notice/add") @ResponseBody - public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeAdd(@RequestBody @Valid NoticeAddRequest noticeAddRequest) { + return noticeService.addNotice(noticeAddRequest); } @ApiOperation("通知公告更新") @PostMapping("/notice/update") @ResponseBody - public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeUpdate(@RequestBody @Valid SystemNotice systemNotice) { + return noticeService.updateNotice(systemNotice); } @@ -308,10 +283,8 @@ @ApiOperation("通知公告标记已读") @PostMapping("/notice/read") @ResponseBody - public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO noticeRead(@RequestBody @Valid NoticeReadRequest noticeReadRequest) { + return noticeService.noticeRead(noticeReadRequest); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java index 4808a4b..3f3c4fe 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemFlowDefController.java @@ -100,10 +100,8 @@ @ApiOperation("流程定义详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO detail(@RequestBody @Valid FlowDetailRequest request) { + return processService.detail(request.getFormId()); } @@ -114,10 +112,8 @@ @ApiOperation("流程定义挂起/激活（废止/挂起）") @PostMapping("/updateState") @ResponseBody - public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateState(@RequestBody @Valid FlowUpdateStateRequest request) { + return processService.updateState(request); } @@ -128,10 +124,8 @@ @ApiOperation("流程定义删除") @PostMapping("/delete") @ResponseBody - public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO delete(@RequestBody @Valid FlowDeleteRequest request) { + return processService.delete(request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java index e348fac..e2fc2d0 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/download/SystemFileConfigController.java @@ -13,15 +13,16 @@ import com.casic.missiles.dto.system.DownloadListResponse; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.system.SystemFileConfig; import com.casic.missiles.service.system.IDownloadCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -42,29 +43,20 @@ @ApiOperation("下载文件分页") @PostMapping("/listPage") - public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult) throws Exception{ - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO> downloadFileListPage(@RequestBody @Valid DownloadListRequest request) throws Exception{ Page page = PageFactory.defaultPage(); return ReturnUtil.success(super.packForBT(downloadCenterService.listPage(page, request))); } @ApiOperation("更新下载文件") @PostMapping("/update") - public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO updateDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.updateDownloadFile(downloadCenter); } @ApiOperation("新增下载文件") @PostMapping("/add") - public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO addDownloadFile(@RequestBody @Valid SystemFileConfig downloadCenter) { return downloadCenterService.addDownloadFile(downloadCenter); } @@ -88,20 +80,14 @@ @ApiOperation("新增下载文件") @PostMapping("/downloadFile") - public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest, BindingResult bindingResult) { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public ReturnDTO downloadFile(@RequestBody @Valid DownloadFileRequest downloadFileRequest) { return downloadCenterService.downloadFile(downloadFileRequest); } @ApiOperation("文件导出") @PostMapping("/listExport") - public void export(@RequestBody @Valid DownloadListRequest request, BindingResult bindingResult, HttpServletResponse response) throws Exception { - if(bindingResult.hasErrors()){ - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - } + public void export(@RequestBody @Valid DownloadListRequest request, HttpServletResponse response) throws Exception { downloadCenterService.downloadFileExport(request,response); } } diff --git a/casic-metering-api/src/main/resources/config/application.yml b/casic-metering-api/src/main/resources/config/application.yml index db7c0a1..607bb8a 100644 --- a/casic-metering-api/src/main/resources/config/application.yml +++ b/casic-metering-api/src/main/resources/config/application.yml @@ -126,7 +126,7 @@ #作者 author: wangpeng #待生成对象表名 - table-name: biz_business_outsource_certificate + table-name: biz_equipment_standard_status,biz_equipment_standard_change_relation reminder: #节点--common模块config包 ReminderNodeConfig配置 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index aaceda7..ee8289a 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -27,6 +27,7 @@ APPROVAL_PROCESSOR_HANDLE_FAILED(2309, "审批通过后处理失败"), FLOW_NO_JOIN_FLOWABLE(2310, "该流程暂未接入Flowable,请重试"), QRCODE_FAILED(2311, "二维码生成失败"), + DRAFT_SAVE_FAILED(2312, "保存至草稿箱失败"), /** * 设备与装置模块 @@ -38,6 +39,8 @@ STANDARD_SAVE_FAILED(2407, "标准装置保存至草稿箱失败"), STANDARD_SUBMIT_FAILED(2408, "标准装置提交处理失败"), STANDARD_SAVE_REJECT(2409, "标准装置保存至草稿箱失败，该标准装置存在您发起的其他流程中"), + EQUIPMENT_STATUS_SAVE_FAILED(2410, "设备状态维护保存至草稿箱失败"), + STANDARD_BUILD_SAVE_FAILED(2411, "标准建立保存至草稿箱失败"), /** * 资源管理模块 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index b6f22e6..579d48d 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -18,6 +18,9 @@ /*************设备与装置模块**************/ String EQUIPMENT_PREFIX = "sbtz"; + String EQUIPMENT_STATUS_PREFIX = "sbztwh"; + String STANDARD_BUILD_PREFIX = "bzjl"; + String STANDARD_STATS_PREFIX = "bzztwh"; /*************资源管理模块**************/ String SUPPLIER_PREFIX = "hggf"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index a8535f0..63dfd4b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -14,5 +14,8 @@ String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; + String CUSTOMER_SUGGEST_FORM = "委托方意见登记表"; + String CUSTOMER_RESULT_REVIEW_NOTICE = "检测结果复查通知单"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java index 290618d..4562f48 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentApplyTypeEnum.java @@ -3,40 +3,21 @@ public class EquipmentApplyTypeEnum { /** - * 设备领用申请 + * 设备启封申请 */ - public static final String REQUIRE_APPLY = "1"; - /** - * 设备借用申请 - */ - public static final String BORROW_APPLY = "2"; - /** - * 设备闲置申请 - */ - public static final String IDEL_APPLY = "3"; + public static final String UNSEAL_APPLY = "1"; /** * 设备封存申请 */ - public static final String SEAL_APPLY = "4"; + public static final String SEAL_APPLY = "2"; /** - * 设备启封申请 + * 设备禁用申请 */ - public static final String UNSEAL_APPLY = "5"; + public static final String DISABLE_APPLY = "3"; /** * 设备报废申请 */ - public static final String SCRAP_APPLY = "6"; - /** - * 设备处置申请 - */ - public static final String HANDLE_APPLY = "10"; - /** - * 设备检修 - */ - public static final String EXAM_APPLY = "8"; - /** - * 设备检修保养验收 - */ - public static final String REPAIR_APPLY = "9"; + public static final String SCRAP_APPLY = "4"; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java new file mode 100644 index 0000000..3b2b659 --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentStatusTypeEnum.java @@ -0,0 +1,25 @@ +package com.casic.missiles.enums.equipment; + + +public interface EquipmentStatusTypeEnum { + /** + * 使用状态：在用 + */ + String IN_USE = "1"; + /** + * 使用状态：禁用 + */ + String DISABLE = "2"; + /** + * 使用状态：报废 + */ + String SCRAP = "3"; + /** + * 使用状态：封存 + */ + String SEAL = "4"; + /** + * 使用状态：延用 + */ + String DELAY= "5"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java index 0cf6794..792452b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/ActionStatusBeanEnum.java @@ -27,6 +27,12 @@ String EQUIPMENT_BEAN_NAME = "equipmentBean"; //标准装置 String STANDARD_BEAN_NAME = "standardBean"; + //设备状态维护 + String EQUIPMENT_STATUS_BEAN_NAME = "equipmentStatusBean"; + //标准建立 + String STANDARD_BUILD_BEAN_NAME = "standardBuildBean"; + //标准装置状态维护 + String STANDARD_STATUS_BEAN_NAME = "standardStatusBean"; /*********************************资源管理************************************/ //授权(代理)委托书 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 86eb960..f52c0ae 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -21,6 +21,9 @@ OUTSOURCE_ASSESS_APPROVAL(OUTSOURCE_ASSESS_BEAN_NAME, ""), OUTSOURCE_PROTOCOL_APPROVAL(OUTSOURCE_PROTOCOL_BEAN_NAME, ""), OUTSOURCE_NOTICE_APPROVAL(OUTSOURCE_NOTICE_BEAN_NAME, ""), + EQUIPMENT_STATUS_APPROVAL(EQUIPMENT_STATUS_BEAN_NAME, ""), + STANDARD_BUILD_APPROVAL(STANDARD_BUILD_BEAN_NAME, ""), + STANDARD_STATUS_APPROVAL(STANDARD_STATUS_BEAN_NAME, ""), ACTION_STATUS_MAP(new HashMap() { { @@ -56,6 +59,17 @@ put(ApplyFromIdEnum.OUTSOURCE_PROTOCOL_APPROVAL.getCode(), OUTSOURCE_PROTOCOL_APPROVAL); //测试、校准或检定工作分包通知书 put(ApplyFromIdEnum.OUTSOURCE_NOTICE_APPROVAL.getCode(), OUTSOURCE_NOTICE_APPROVAL); + //设备状态维护 + put(ApplyFromIdEnum.EQUIPMENT_SEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_UNSEALED_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_SCRAP_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + put(ApplyFromIdEnum.EQUIPMENT_DISABLE_APPROVAL.getCode(), EQUIPMENT_STATUS_APPROVAL); + //标准建立 + put(ApplyFromIdEnum.STANDARD_BUILD_APPROVAL.getCode(), STANDARD_BUILD_APPROVAL); + //标准装置状态维护 + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVIEW_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); + put(ApplyFromIdEnum.STANDARD_REVOKE_APPROVAL.getCode(), STANDARD_STATUS_APPROVAL); } }); String actionBeanName; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 64ff07e..3f8c6b1 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -17,6 +17,14 @@ /*******************************************设备与装置*********************************************/ EQUIPMENT_APPROVAL("sbyzzsbtzgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备台账审批"), STANDARD_APPROVAL("sbyzzbzzztzxx", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置台账审批"), + EQUIPMENT_UNSEALED_APPROVAL("sbyzzsbqfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备启封申请"), + EQUIPMENT_SEALED_APPROVAL("sbyzzsbfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备封存申请"), + EQUIPMENT_DISABLE_APPROVAL("sbyzzsbjysq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备禁用申请"), + EQUIPMENT_SCRAP_APPROVAL("sbyzzsbbfsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "设备报废申请"), + STANDARD_BUILD_APPROVAL("sbyzzjbgl", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准建立"), + STANDARD_CHANGE_APPROVAL("sbyzzghsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置更换申请"), + STANDARD_REVIEW_APPROVAL("sbyzzfcsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置复查申请"), + STANDARD_REVOKE_APPROVAL("sbyzzcxsq", MessageSourceModuleEnum.EQUIPMENT.getCode(), "标准装置撤销申请"), /*******************************************资源管理***********************************************/ AUTHORIZE_ORDER_APPROVAL("zyglsqwts", MessageSourceModuleEnum.RESOURCE.getCode(), "授权(代理)委托书审批"), diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java index e636e1f..4aaf435 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessCertificateReportMapper.java @@ -1,8 +1,7 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.casic.missiles.dto.business.certificate.CertificateReportApprovalListRequest; -import com.casic.missiles.dto.business.certificate.CertificateReportDetailResponse; +import com.casic.missiles.dto.business.certificate.*; import com.casic.missiles.mapper.GeneralApprovalMapper; import com.casic.missiles.model.business.BizBusinessCertificateReport; import org.apache.ibatis.annotations.Param; @@ -29,4 +28,8 @@ @Select("SELECT IFNULL(sum(require_certifications),0) FROM biz_business_lab_executive_info blei where blei.measure_status = 4 and blei.sample_id = #{sampleId} and blei.order_id = #{orderId}") Long selectSampleCertificationAlls(@Param("sampleId") Long sampleId, @Param("orderId") Long orderId); + + Page certificateRecordsById(Page page, @Param("request") CertificateRecordRequest certificateRecordRequest); + + Page certificateMonitorsById(Page page, @Param("request") CertificateMonitorRequest certificateMonitorRequest); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java index b6f4ef5..8203016 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessInterchangeInfoMapper.java @@ -2,6 +2,7 @@ import com.casic.missiles.model.business.BizBusinessInterchangeInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -14,4 +15,6 @@ public interface BizBusinessInterchangeInfoMapper extends BaseMapper { Long selectMaxNo(); + + BizBusinessInterchangeInfo selectDetailById(@Param("id") Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 4506fa9..6654e91 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -4,6 +4,8 @@ import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.business.dispatch.SampleDispatchListRequest; import com.casic.missiles.dto.business.dispatch.SampleDispatchListResponse; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListRequest; +import com.casic.missiles.dto.business.interchange.InterchangeSampleListResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutDetailResponse; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListRequest; import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; @@ -36,4 +38,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + Page listPageForInterchange(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); + + List selectSampleIdsForInterchange(); + + List selectSampleList(@Param("interchangeId") Long interchangeId, @Param("orderId") Long orderId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java index 6ba5688..2f167ce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessLabExecutiveInfoMapper.java @@ -38,6 +38,8 @@ Long selectMinSeq(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + Integer selectCertCount(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); + // Page selectListByDeptId(Page page, @Param("deptId") Long deptId); // // Page selectListByUserId(Page page, @Param("userId") Long userId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java new file mode 100644 index 0000000..0aeb036 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/eqpt/EqptEquipmentGroupInfoMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.eqpt; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.eqpt.EqptEquipmentGroupInfo; + +/** + *

+ * 受检设备-设备分组信息表 Mapper 接口 + *

+ * + * @author zhangyingjie + * @since 2023-07-26 + */ +public interface EqptEquipmentGroupInfoMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java new file mode 100644 index 0000000..d40d401 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizBusinessEquipmentStatusLogMapper.java @@ -0,0 +1,16 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.model.equipment.BizEquipmentStatusLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * 设备与装置-设备台账-状态变更记录 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizBusinessEquipmentStatusLogMapper extends BaseMapper { + +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java new file mode 100644 index 0000000..6d6db3d --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardBuildMapper.java @@ -0,0 +1,24 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardBuildApprovalListRequest; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardBuild; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置管理-标准建立 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardBuildMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardBuildApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java new file mode 100644 index 0000000..524f15b --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardChangeRelationMapper.java @@ -0,0 +1,21 @@ +package com.casic.missiles.mapper.equipment; + +import com.casic.missiles.dto.equipment.StandardStatusChangeEquipmentDTO; +import com.casic.missiles.model.equipment.BizEquipmentStandardChangeRelation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护-更换申请设备更换信息 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardChangeRelationMapper extends BaseMapper { + + List selectListByStandardStatusId(@Param("id") Long id, @Param("changeType") Integer changeType); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java new file mode 100644 index 0000000..1c2b8a3 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStandardStatusMapper.java @@ -0,0 +1,28 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.StandardStatusApprovalListResponse; +import com.casic.missiles.dto.equipment.StandardStatusDetailResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStandardStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-标准装置状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-31 + */ +public interface BizEquipmentStandardStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") StandardStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + + StandardStatusDetailResponse selectDetailById(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java new file mode 100644 index 0000000..e1475b7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/BizEquipmentStatusMapper.java @@ -0,0 +1,26 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListRequest; +import com.casic.missiles.dto.equipment.EquipmentStatusApprovalListResponse; +import com.casic.missiles.mapper.GeneralApprovalMapper; +import com.casic.missiles.model.equipment.BizEquipmentStatus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 设备与装置-设备状态维护 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2023-08-30 + */ +public interface BizEquipmentStatusMapper extends GeneralApprovalMapper { + + Page selectBatchForApprovalList(Page page, @Param("request") EquipmentStatusApprovalListRequest request, @Param("businessKeys") List businessKeys); + + Long selectMaxNo(); + +} diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml index 767695d..bfb5b47 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessCertificateReportMapper.xml @@ -22,6 +22,7 @@ + @@ -39,7 +40,7 @@ - id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + id, certificate_report_no, certificate_report_name, origin_record_name, measure_category, calibration_time, measure_dept_id, measure_person_id, order_id, environment_id, temperature, humidity, issuance_date, expiration_date, calibration_address, technique_file_id, measure_result, limit_scope, submit_date, measure_conclusion, sample_id, approval_status, origin_record_template_id, template_id, certificate_report_file, original_record_file, process_id, remark, create_user_id, create_user_name, create_time, update_time + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time @@ -98,4 +99,35 @@ LEFT JOIN biz_business_order_info boi ON boi.id = bcr.order_id WHERE bcr.id = #{id} + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml index 9e36f6b..b38f90c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessInterchangeInfoMapper.xml @@ -31,4 +31,11 @@ + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index bef9d7b..a75aea3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -33,16 +33,14 @@ eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.category, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time bosr.sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.manufacture_no AS manufactureNo, - eei.manufacturer, eei.manufacturer_country, eei.manufacturing_date, eei.ABC, bo.customer_id, bo.customer_no, bo.customer_name, bo.customer_phone, bo.customer_address, bo.id AS orderId, - bo.order_no, bo.deliverer, bo.deliverer_tel, bo.plan_deliver_time, bo.require_over_time, bo.certifications, bosr.measure_content, eei.measure_period, - eei.measure_last_time AS measureLastDate, eei.valid_deadline AS effectiveDate, bosr.remark, eei.minio_file_name, bosr.measure_type, eei.label_bind + bo.customer_id, bo.customer_name, bo.id AS orderId, bo.order_no, bosr.measure_content @@ -132,9 +127,9 @@ + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 6bd38a9..3fd156a 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -32,7 +32,7 @@ blei.id AS id, eei.id AS sample_id, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, eei.model AS sampleModel, - eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, + eei.manufacture_no AS manufactureNo, bo.order_no AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, blei.require_certifications, blei.measure_status, blei.measure_person_id, eei.RFID AS labelBind @@ -59,7 +59,7 @@ - + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml new file mode 100644 index 0000000..09e2e44 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizBusinessEquipmentStatusLogMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + id, equipment_id, status_type, start_time, end_time, create_user_id, create_user_name, reason + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml new file mode 100644 index 0000000..bb7a26b --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardBuildMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, standard_name, meter_organize, standard_file_template, build_standard_report_file, exam_table_file, standard_certificate_file, + process_id, approval_status, remark, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml new file mode 100644 index 0000000..de3430f --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardChangeRelationMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + id, equipment_id, standard_status_id, change_type + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml new file mode 100644 index 0000000..1096cbc --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStandardStatusMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, apply_no, apply_name, approval_type, standard_id, apply_illustrate, apply_file, create_user_id, create_user_name, approval_status, process_id, create_time, update_time + + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml new file mode 100644 index 0000000..1f92c92 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/BizEquipmentStatusMapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + id, approval_no, approval_name, approval_type, equipment_id, perform_status, approval_reason, approval_address, approval_time, equipment_status, approval_status, process_id, create_user_id, create_user_name, create_time, update_time + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml index e9836b8..a3693b5 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerResultReviewNoticeMapper.xml @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - id, customer_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time + id, dept_id, customer_name, lab_code, notice_user_id, notice_user_name, notice_no, notice_name, submit_date, device_name, device_model, device_no, return_date, notice_date, create_user_id, create_user_name, create_time, update_time