cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

dev
zhanglei 2026-07-07 13:58:33 +08:00
parent f032a2c2d1
commit e753ccf0ab
26 changed files with 135 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/config/GbsUserSyncInterceptor.java
View File

@ -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) {

5
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return accountApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return accountApi.delete(req.getData());
}
@ApiOperation("分页查询用户")

5
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgDepartmentController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgDepartmentApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgDepartmentApi.delete(req.getData());
}
@ApiOperation("分页查询部门")

7
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgEquipmentController.java
View File

@ -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<OrgEquipmentCO> get(@ApiParam("主键ID") @RequestParam Long id) {
public SingleResponse<OrgEquipmentCO> get(@ApiParam("主键ID") @RequestBody Long id) {
return orgEquipmentApi.get(id);
}
@ -48,8 +49,8 @@ public class OrgEquipmentController {
@ApiOperation("删除装备信息")
@PostMapping("/delete")
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgEquipmentApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgEquipmentApi.delete(req.getData());
}
@ApiOperation("分页查询装备信息")

16
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgInfoController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgInfoApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgInfoApi.delete(req.getData());
}
@ApiOperation("启用/禁用机构信息")
@ -67,8 +63,8 @@ public class OrgInfoController {
@ApiOperation("重置机构密码")
@PostMapping("/reset-password")
public SingleResponse<Void> resetPassword(@ApiParam("主键ID") @RequestParam Long id) {
return orgInfoApi.resetPassword(id);
public SingleResponse<Void> resetPassword(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgInfoApi.resetPassword(req.getData());
}
@ApiOperation("分页查询机构信息")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelCertController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgPersonnelCertApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgPersonnelCertApi.delete(req.getData());
}
@ApiOperation("分页查询人员证书")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelChangeController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgPersonnelChangeApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgPersonnelChangeApi.delete(req.getData());
}
@ApiOperation("分页查询人员变更记录")

15
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgPersonnelApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgPersonnelApi.delete(req.getData());
}
@ApiOperation("分页查询人员信息")
@ -60,7 +57,7 @@ public class OrgPersonnelController {
@ApiOperation("重置人员密码")
@PostMapping("/reset-password")
public SingleResponse<Void> resetPassword(@ApiParam("主键ID") @RequestParam Long id) {
return orgPersonnelApi.resetPassword(id);
public SingleResponse<Void> resetPassword(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgPersonnelApi.resetPassword(req.getData());
}
}

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPositionController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgPositionApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgPositionApi.delete(req.getData());
}
@ApiOperation("分页查询岗位")

13
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgQualificationController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgQualificationApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgQualificationApi.delete(req.getData());
}
@ApiOperation("分页查询机构资质证书")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgResignApplyController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return orgResignApplyApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return orgResignApplyApi.delete(req.getData());
}
@ApiOperation("分页查询人员离职申请")

5
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingChangeApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingChangeApi.delete(req.getData());
}
@ApiOperation("分页查询备案变更-监管端")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeDetailController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingChangeDetailApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingChangeDetailApi.delete(req.getData());
}
@ApiOperation("分页查询备案变更明细")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingCommitmentController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingCommitmentApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingCommitmentApi.delete(req.getData());
}
@ApiOperation("分页查询法定代表人承诺书")

5
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingApi.delete(req.getData());
}
@ApiOperation("合规检查")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingEquipmentController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingEquipmentApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingEquipmentApi.delete(req.getData());
}
@ApiOperation("分页查询备案申请装备")

18
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingExpertController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingExpertApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingExpertApi.delete(req.getData());
}
@ApiOperation("分页查询审核专家")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingMaterialController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingMaterialApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingMaterialApi.delete(req.getData());
}
@ApiOperation("分页查询备案申请材料")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelCertController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingPersonnelCertApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingPersonnelCertApi.delete(req.getData());
}
@ApiOperation("分页查询备案申请人员证书")

11
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingPersonnelController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingPersonnelApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingPersonnelApi.delete(req.getData());
}
@ApiOperation("分页查询备案申请人员")

18
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingReviewController.java
View File

@ -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<Void> delete(@ApiParam("主键ID") @RequestParam Long id) {
return qualFilingReviewApi.delete(id);
public SingleResponse<Void> delete(@ApiParam("主键ID") @RequestBody Req<Long> req) {
return qualFilingReviewApi.delete(req.getData());
}
@ApiOperation("分页查询资质审核记录")

3
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgQualificationExecutor.java
View File

@ -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<OrgQualificationEntity> pageResult = orgQualificationDomainService.page(domainQuery);

8
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/BasePageQuery.java
View File

@ -3,6 +3,8 @@ package org.qinan.safetyeval.client.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 分页查询基类
* <p>
@ -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;
}

9
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/OrgQualificationQuery.java
View File

@ -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;
}

26
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/base/Req.java Normal file
View File

@ -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<T> {
private static final long serialVersionUID = 1L;
@Schema(description = "请求参数，可为基本类型（包装类），可以为其它可序列化对象")
private T data;
public static <T> Req<T> create() {
return Req.<T>builder().build();
}
}

4
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgQualificationGatewayImpl.java
View File

@ -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<OrgQualificationDO> page = new Page<>(query.getPageNum(), query.getPageSize());
IPage<OrgQualificationDO> result = orgQualificationMapper.selectPage(page, wrapper);