From e753ccf0ab8520e5713a6c4c2ac3cef087430963 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 7 Jul 2026 13:58:33 +0800 Subject: [PATCH] bug --- .../config/GbsUserSyncInterceptor.java | 3 ++- .../adapter/web/AccountController.java | 5 ++-- .../adapter/web/OrgDepartmentController.java | 5 ++-- .../adapter/web/OrgEquipmentController.java | 7 ++--- .../adapter/web/OrgInfoController.java | 16 +++++------- .../web/OrgPersonnelCertController.java | 11 +++----- .../web/OrgPersonnelChangeController.java | 11 +++----- .../adapter/web/OrgPersonnelController.java | 15 +++++------ .../adapter/web/OrgPositionController.java | 11 +++----- .../web/OrgQualificationController.java | 13 ++++------ .../adapter/web/OrgResignApplyController.java | 11 +++----- .../web/QualFilingChangeController.java | 5 ++-- .../web/QualFilingChangeDetailController.java | 11 +++----- .../web/QualFilingCommitmentController.java | 11 +++----- .../adapter/web/QualFilingController.java | 5 ++-- .../web/QualFilingEquipmentController.java | 11 +++----- .../web/QualFilingExpertController.java | 18 ++++--------- .../web/QualFilingMaterialController.java | 11 +++----- .../QualFilingPersonnelCertController.java | 11 +++----- .../web/QualFilingPersonnelController.java | 11 +++----- .../web/QualFilingReviewController.java | 18 ++++--------- .../executor/OrgQualificationExecutor.java | 3 +++ .../safetyeval/client/dto/BasePageQuery.java | 8 ++++++ .../domain/query/OrgQualificationQuery.java | 9 +++++++ .../infrastructure/dataobject/base/Req.java | 26 +++++++++++++++++++ .../OrgQualificationGatewayImpl.java | 4 +++ 26 files changed, 135 insertions(+), 135 deletions(-) create mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/base/Req.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java index f6ca348..036fde8 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java @@ -36,7 +36,8 @@ public class GbsUserSyncInterceptor implements WebMvcConfigurer { "/**/account/syncUserToGBS/**", "/**/org-info/save/**", "/**/account/save/**", - "/**/account/sendMessage/**" + "/**/account/sendMessage/**", + "/**/file/**" }; @Override public void addInterceptors(InterceptorRegistry registry) { diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java index 3cd6673..b39e722 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java @@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j; import org.qinan.safetyeval.client.api.AccountApi; import org.qinan.safetyeval.client.co.AccountCO; import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.qinan.safetyeval.infrastructure.remote.SmsRemote; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -51,8 +52,8 @@ public class AccountController { @ApiOperation("删除用户") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return accountApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return accountApi.delete(req.getData()); } @ApiOperation("分页查询用户") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java index 9cc2159..f256cc5 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgDepartmentApi; import org.qinan.safetyeval.client.co.OrgDepartmentCO; import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,8 +46,8 @@ public class OrgDepartmentController { @ApiOperation("删除部门") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgDepartmentApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgDepartmentApi.delete(req.getData()); } @ApiOperation("分页查询部门") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java index c8ca4ab..d6ba916 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java @@ -10,6 +10,7 @@ import org.qinan.safetyeval.client.co.OrgEquipmentCO; import org.qinan.safetyeval.client.dto.OrgEquipmentAddCmd; import org.qinan.safetyeval.client.dto.OrgEquipmentModifyCmd; import org.qinan.safetyeval.client.dto.OrgEquipmentPageQuery; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,7 +37,7 @@ public class OrgEquipmentController { @ApiOperation("查询装备信息详情") @GetMapping("/get") - public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { + public SingleResponse get(@ApiParam("主键ID") @RequestBody Long id) { return orgEquipmentApi.get(id); } @@ -48,8 +49,8 @@ public class OrgEquipmentController { @ApiOperation("删除装备信息") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgEquipmentApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgEquipmentApi.delete(req.getData()); } @ApiOperation("分页查询装备信息") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java index 767e72d..2ffc49f 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java @@ -1,16 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgInfoApi; import org.qinan.safetyeval.client.co.OrgInfoCO; -import org.qinan.safetyeval.client.dto.OrgInfoAddCmd; -import org.qinan.safetyeval.client.dto.OrgInfoModifyCmd; -import org.qinan.safetyeval.client.dto.OrgInfoPageQuery; -import org.qinan.safetyeval.client.dto.OrgInfoUpdateStateCmd; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -55,8 +51,8 @@ public class OrgInfoController { @ApiOperation("删除机构信息") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgInfoApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgInfoApi.delete(req.getData()); } @ApiOperation("启用/禁用机构信息") @@ -67,8 +63,8 @@ public class OrgInfoController { @ApiOperation("重置机构密码") @PostMapping("/reset-password") - public SingleResponse resetPassword(@ApiParam("主键ID") @RequestParam Long id) { - return orgInfoApi.resetPassword(id); + public SingleResponse resetPassword(@ApiParam("主键ID") @RequestBody Req req) { + return orgInfoApi.resetPassword(req.getData()); } @ApiOperation("分页查询机构信息") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java index 912f230..4c2c8f5 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPersonnelCertApi; import org.qinan.safetyeval.client.co.OrgPersonnelCertCO; -import org.qinan.safetyeval.client.dto.OrgPersonnelCertAddCmd; -import org.qinan.safetyeval.client.dto.OrgPersonnelCertModifyCmd; -import org.qinan.safetyeval.client.dto.OrgPersonnelCertPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class OrgPersonnelCertController { @ApiOperation("删除人员证书") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgPersonnelCertApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgPersonnelCertApi.delete(req.getData()); } @ApiOperation("分页查询人员证书") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java index deff1b4..d206ac9 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPersonnelChangeApi; import org.qinan.safetyeval.client.co.OrgPersonnelChangeCO; -import org.qinan.safetyeval.client.dto.OrgPersonnelChangeAddCmd; -import org.qinan.safetyeval.client.dto.OrgPersonnelChangeModifyCmd; -import org.qinan.safetyeval.client.dto.OrgPersonnelChangePageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class OrgPersonnelChangeController { @ApiOperation("删除人员变更记录") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgPersonnelChangeApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgPersonnelChangeApi.delete(req.getData()); } @ApiOperation("分页查询人员变更记录") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java index 04df076..43e4907 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPersonnelApi; import org.qinan.safetyeval.client.co.OrgPersonnelCO; -import org.qinan.safetyeval.client.dto.OrgPersonnelAddCmd; -import org.qinan.safetyeval.client.dto.OrgPersonnelModifyCmd; -import org.qinan.safetyeval.client.dto.OrgPersonnelPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class OrgPersonnelController { @ApiOperation("删除人员信息") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgPersonnelApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgPersonnelApi.delete(req.getData()); } @ApiOperation("分页查询人员信息") @@ -60,7 +57,7 @@ public class OrgPersonnelController { @ApiOperation("重置人员密码") @PostMapping("/reset-password") - public SingleResponse resetPassword(@ApiParam("主键ID") @RequestParam Long id) { - return orgPersonnelApi.resetPassword(id); + public SingleResponse resetPassword(@ApiParam("主键ID") @RequestBody Req req) { + return orgPersonnelApi.resetPassword(req.getData()); } } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java index 15c1faf..20d5def 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgPositionApi; import org.qinan.safetyeval.client.co.OrgPositionCO; -import org.qinan.safetyeval.client.dto.OrgPositionAddCmd; -import org.qinan.safetyeval.client.dto.OrgPositionModifyCmd; -import org.qinan.safetyeval.client.dto.OrgPositionPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class OrgPositionController { @ApiOperation("删除岗位") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgPositionApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgPositionApi.delete(req.getData()); } @ApiOperation("分页查询岗位") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java index eea9ca5..25bb0c3 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgQualificationApi; import org.qinan.safetyeval.client.co.OrgQualificationCO; -import org.qinan.safetyeval.client.dto.OrgQualificationAddCmd; -import org.qinan.safetyeval.client.dto.OrgQualificationModifyCmd; -import org.qinan.safetyeval.client.dto.OrgQualificationPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -50,8 +47,8 @@ public class OrgQualificationController { @ApiOperation("删除机构资质证书") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgQualificationApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgQualificationApi.delete(req.getData()); } @ApiOperation("分页查询机构资质证书") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java index 3683878..975fdbf 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.OrgResignApplyApi; import org.qinan.safetyeval.client.co.OrgResignApplyCO; -import org.qinan.safetyeval.client.dto.OrgResignApplyAddCmd; -import org.qinan.safetyeval.client.dto.OrgResignApplyModifyCmd; -import org.qinan.safetyeval.client.dto.OrgResignApplyPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class OrgResignApplyController { @ApiOperation("删除人员离职申请") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return orgResignApplyApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return orgResignApplyApi.delete(req.getData()); } @ApiOperation("分页查询人员离职申请") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index 12a01db..d5b6beb 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -10,6 +10,7 @@ import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingChangeOrgCO; import org.qinan.safetyeval.client.dto.*; import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -32,8 +33,8 @@ public class QualFilingChangeController { @ApiOperation("删除备案变更") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingChangeApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingChangeApi.delete(req.getData()); } @ApiOperation("分页查询备案变更-监管端") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java index 74e9cf2..e19b1d2 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingChangeDetailApi; import org.qinan.safetyeval.client.co.QualFilingChangeDetailCO; -import org.qinan.safetyeval.client.dto.QualFilingChangeDetailAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingChangeDetailModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingChangeDetailPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class QualFilingChangeDetailController { @ApiOperation("删除备案变更明细") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingChangeDetailApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingChangeDetailApi.delete(req.getData()); } @ApiOperation("分页查询备案变更明细") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java index 48d40ec..c37e5cf 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingCommitmentApi; import org.qinan.safetyeval.client.co.QualFilingCommitmentCO; -import org.qinan.safetyeval.client.dto.QualFilingCommitmentAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingCommitmentModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingCommitmentPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class QualFilingCommitmentController { @ApiOperation("删除法定代表人承诺书") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingCommitmentApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingCommitmentApi.delete(req.getData()); } @ApiOperation("分页查询法定代表人承诺书") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java index 697fb37..76418dd 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java @@ -8,6 +8,7 @@ import org.qinan.safetyeval.client.co.QualFilingCO; import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO; import org.qinan.safetyeval.client.co.QualFilingDetailCO; import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -66,8 +67,8 @@ public class QualFilingController { @ApiOperation("删除资质备案申请") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingApi.delete(req.getData()); } @ApiOperation("合规检查") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java index 69cd715..8e001e7 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingEquipmentApi; import org.qinan.safetyeval.client.co.QualFilingEquipmentCO; -import org.qinan.safetyeval.client.dto.QualFilingEquipmentAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingEquipmentModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingEquipmentPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class QualFilingEquipmentController { @ApiOperation("删除备案申请装备") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingEquipmentApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingEquipmentApi.delete(req.getData()); } @ApiOperation("分页查询备案申请装备") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java index eeb4cd8..975ce2d 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java @@ -5,18 +5,10 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingExpertApi; import org.qinan.safetyeval.client.co.QualFilingExpertCO; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.QualFilingExpertAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingExpertModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingExpertPageQuery; -import org.qinan.safetyeval.client.dto.SingleResponse; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -53,8 +45,8 @@ public class QualFilingExpertController { @ApiOperation("删除审核专家") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingExpertApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingExpertApi.delete(req.getData()); } @ApiOperation("分页查询审核专家") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java index e363953..a92c6b9 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingMaterialApi; import org.qinan.safetyeval.client.co.QualFilingMaterialCO; -import org.qinan.safetyeval.client.dto.QualFilingMaterialAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingMaterialModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingMaterialPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class QualFilingMaterialController { @ApiOperation("删除备案申请材料") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingMaterialApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingMaterialApi.delete(req.getData()); } @ApiOperation("分页查询备案申请材料") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java index 28a27af..8fd9510 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingPersonnelCertApi; import org.qinan.safetyeval.client.co.QualFilingPersonnelCertCO; -import org.qinan.safetyeval.client.dto.QualFilingPersonnelCertAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingPersonnelCertModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingPersonnelCertPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class QualFilingPersonnelCertController { @ApiOperation("删除备案申请人员证书") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingPersonnelCertApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingPersonnelCertApi.delete(req.getData()); } @ApiOperation("分页查询备案申请人员证书") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java index 26c1318..5a48f86 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java @@ -1,15 +1,12 @@ package org.qinan.safetyeval.adapter.web; import io.swagger.annotations.Api; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SingleResponse; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingPersonnelApi; import org.qinan.safetyeval.client.co.QualFilingPersonnelCO; -import org.qinan.safetyeval.client.dto.QualFilingPersonnelAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingPersonnelModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingPersonnelPageQuery; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,8 +45,8 @@ public class QualFilingPersonnelController { @ApiOperation("删除备案申请人员") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingPersonnelApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingPersonnelApi.delete(req.getData()); } @ApiOperation("分页查询备案申请人员") diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java index be4deb1..d5fa6a1 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java @@ -5,18 +5,10 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.QualFilingReviewApi; import org.qinan.safetyeval.client.co.QualFilingReviewCO; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.QualFilingReviewAddCmd; -import org.qinan.safetyeval.client.dto.QualFilingReviewModifyCmd; -import org.qinan.safetyeval.client.dto.QualFilingReviewPageQuery; -import org.qinan.safetyeval.client.dto.SingleResponse; +import org.qinan.safetyeval.client.dto.*; +import org.qinan.safetyeval.infrastructure.dataobject.base.Req; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -53,8 +45,8 @@ public class QualFilingReviewController { @ApiOperation("删除资质审核记录") @PostMapping("/delete") - public SingleResponse delete(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingReviewApi.delete(id); + public SingleResponse delete(@ApiParam("主键ID") @RequestBody Req req) { + return qualFilingReviewApi.delete(req.getData()); } @ApiOperation("分页查询资质审核记录") diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java index 3b7f2b7..7187ed7 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java @@ -95,6 +95,9 @@ public class OrgQualificationExecutor implements OrgQualificationApi { domainQuery.setCertName(query.getCertName()); domainQuery.setCertNo(query.getCertNo()); domainQuery.setEnableFlag(query.getEnableFlag()); + domainQuery.setStartTime(query.getStartTime()); + domainQuery.setEndTime(query.getEndTime()); + PageResult pageResult = orgQualificationDomainService.page(domainQuery); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java index 9a4d094..ce5231f 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java @@ -3,6 +3,8 @@ package org.qinan.safetyeval.client.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDateTime; + /** * 分页查询基类 *

@@ -22,4 +24,10 @@ public class BasePageQuery { @ApiModelProperty(value = "排序（格式: column:asc|desc, 多个用逗号分隔）") private String orders; + + @ApiModelProperty(value = "开始时间") + private LocalDateTime startTime; + + @ApiModelProperty(value = "结束时间") + private LocalDateTime endTime; } diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgQualificationQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgQualificationQuery.java index 1e34522..e593835 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgQualificationQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgQualificationQuery.java @@ -1,7 +1,10 @@ package org.qinan.safetyeval.domain.query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDateTime; + /** * 机构资质证书领域查询对象 * @@ -30,4 +33,10 @@ public class OrgQualificationQuery { /** 启用标识 */ private Long enableFlag; + + @ApiModelProperty(value = "开始时间") + private LocalDateTime startTime; + + @ApiModelProperty(value = "结束时间") + private LocalDateTime endTime; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/base/Req.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/base/Req.java new file mode 100644 index 0000000..2441b1a --- /dev/null +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/base/Req.java @@ -0,0 +1,26 @@ +package org.qinan.safetyeval.infrastructure.dataobject.base; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import lombok.experimental.SuperBuilder; + +@Schema(description = "请求对象") +@SuperBuilder +@Accessors(chain = true) +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Req { + + private static final long serialVersionUID = 1L; + + @Schema(description = "请求参数，可为基本类型（包装类），可以为其它可序列化对象") + private T data; + + public static Req create() { + return Req.builder().build(); + } +} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgQualificationGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgQualificationGatewayImpl.java index 500eb4e..a59200b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgQualificationGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgQualificationGatewayImpl.java @@ -85,6 +85,10 @@ public class OrgQualificationGatewayImpl implements OrgQualificationGateway { if (query.getEnableFlag() != null) { wrapper.eq(OrgQualificationDO::getEnableFlag, query.getEnableFlag()); } + if (query.getStartTime() != null && query.getEndTime() != null) { + wrapper.ge(OrgQualificationDO::getValidStartDate, query.getStartTime().toLocalDate()) + .le(OrgQualificationDO::getValidEndDate, query.getEndTime().toLocalDate()); + } Page page = new Page<>(query.getPageNum(), query.getPageSize()); IPage result = orgQualificationMapper.selectPage(page, wrapper);