From 1061187a28bc07f962f4000f849a37a8219c0684 Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Thu, 16 Jul 2026 16:12:32 +0800 Subject: [PATCH] init --- .../executor/OrgPersonnelCertExecutor.java | 37 ++----------- .../convertor/OrgPersonnelCertConvertor.java | 32 +++++++++++ .../OrgPersonnelCertGatewayImpl.java | 55 +++---------------- 3 files changed, 47 insertions(+), 77 deletions(-) create mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/OrgPersonnelCertConvertor.java diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java index 5d3697b..4d3524d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelCertExecutor.java @@ -13,6 +13,7 @@ import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgPersonnelCertDomainService; import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; +import org.qinan.safetyeval.infrastructure.convertor.OrgPersonnelCertConvertor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -29,23 +30,12 @@ public class OrgPersonnelCertExecutor implements OrgPersonnelCertApi { @Autowired(required = false) private OrgPersonnelCertDomainService orgPersonnelCertDomainService; + @Autowired + private OrgPersonnelCertConvertor orgPersonnelCertConvertor; + @Override public SingleResponse add(OrgPersonnelCertAddCmd cmd) { - OrgPersonnelCertEntity entity = new OrgPersonnelCertEntity(); - entity.setCertName(cmd.getCertName()); - entity.setCertTypeCode(cmd.getCertTypeCode()); - entity.setCertTypeName(cmd.getCertTypeName()); - entity.setCertCategoryCode(cmd.getCertCategoryCode()); - entity.setCertCategoryName(cmd.getCertCategoryName()); - entity.setOperationCategoryCode(cmd.getOperationCategoryCode()); - entity.setOperationCategoryName(cmd.getOperationCategoryName()); - entity.setCertNo(cmd.getCertNo()); - entity.setIssueOrg(cmd.getIssueOrg()); - entity.setValidStartDate(cmd.getValidStartDate()); - entity.setValidEndDate(cmd.getValidEndDate()); - entity.setReviewDate(cmd.getReviewDate()); - entity.setCertAttachmentUrl(cmd.getCertAttachmentUrl()); - entity.setPersonnelId(cmd.getPersonnelId()); + OrgPersonnelCertEntity entity = orgPersonnelCertConvertor.addCmdToEntity(cmd); OrgPersonnelCertEntity result = orgPersonnelCertDomainService.add(entity); return SingleResponse.success(toCO(result)); @@ -59,22 +49,7 @@ public class OrgPersonnelCertExecutor implements OrgPersonnelCertApi { @Override public SingleResponse modify(OrgPersonnelCertModifyCmd cmd) { - OrgPersonnelCertEntity entity = new OrgPersonnelCertEntity(); - entity.setId(cmd.getId()); - entity.setCertName(cmd.getCertName()); - entity.setCertTypeCode(cmd.getCertTypeCode()); - entity.setCertTypeName(cmd.getCertTypeName()); - entity.setCertCategoryCode(cmd.getCertCategoryCode()); - entity.setCertCategoryName(cmd.getCertCategoryName()); - entity.setOperationCategoryCode(cmd.getOperationCategoryCode()); - entity.setOperationCategoryName(cmd.getOperationCategoryName()); - entity.setCertNo(cmd.getCertNo()); - entity.setIssueOrg(cmd.getIssueOrg()); - entity.setValidStartDate(cmd.getValidStartDate()); - entity.setValidEndDate(cmd.getValidEndDate()); - entity.setReviewDate(cmd.getReviewDate()); - entity.setCertAttachmentUrl(cmd.getCertAttachmentUrl()); - entity.setPersonnelId(cmd.getPersonnelId()); + OrgPersonnelCertEntity entity = orgPersonnelCertConvertor.modifyCmdToEntity(cmd); OrgPersonnelCertEntity result = orgPersonnelCertDomainService.modify(entity); return SingleResponse.success(toCO(result)); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/OrgPersonnelCertConvertor.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/OrgPersonnelCertConvertor.java new file mode 100644 index 0000000..71d121e --- /dev/null +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/OrgPersonnelCertConvertor.java @@ -0,0 +1,32 @@ +package org.qinan.safetyeval.infrastructure.convertor; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.factory.Mappers; +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.domain.entity.OrgPersonnelCertEntity; +import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelCertDO; + +/** + * 人员证书 Cmd/Entity/CO/DO 转换器 + * + * @author safety-eval + */ +@Mapper(componentModel = "spring") +public interface OrgPersonnelCertConvertor { + + OrgPersonnelCertConvertor INSTANCE = Mappers.getMapper(OrgPersonnelCertConvertor.class); + + OrgPersonnelCertEntity addCmdToEntity(OrgPersonnelCertAddCmd cmd); + + OrgPersonnelCertEntity modifyCmdToEntity(OrgPersonnelCertModifyCmd cmd); + + OrgPersonnelCertCO entityToCO(OrgPersonnelCertEntity entity); + + OrgPersonnelCertEntity doToEntity(OrgPersonnelCertDO dataObject); + + @Mapping(target = "orgId", ignore = true) + OrgPersonnelCertDO entityToDO(OrgPersonnelCertEntity entity); +} diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java index dd5df5d..fe3e542 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgPersonnelCertGatewayImpl.java @@ -7,6 +7,7 @@ import org.qinan.safetyeval.domain.entity.OrgPersonnelCertEntity; import org.qinan.safetyeval.domain.gateway.OrgPersonnelCertGateway; import org.qinan.safetyeval.domain.query.OrgPersonnelCertQuery; import org.qinan.safetyeval.domain.query.PageResult; +import org.qinan.safetyeval.infrastructure.convertor.OrgPersonnelCertConvertor; import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelCertDO; import org.qinan.safetyeval.infrastructure.mapper.OrgPersonnelCertMapper; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; @@ -32,6 +33,9 @@ public class OrgPersonnelCertGatewayImpl implements OrgPersonnelCertGateway { @Resource private OrgContextResolver orgContextResolver; + @Resource + private OrgPersonnelCertConvertor orgPersonnelCertConvertor; + @Override public OrgPersonnelCertEntity save(OrgPersonnelCertEntity entity) { OrgPersonnelCertDO dataObject = toDO(entity); @@ -44,7 +48,7 @@ public class OrgPersonnelCertGatewayImpl implements OrgPersonnelCertGateway { @Override public OrgPersonnelCertEntity get(Long id) { OrgPersonnelCertDO dataObject = orgPersonnelCertMapper.selectById(id); - return toEntity(dataObject); + return orgPersonnelCertConvertor.doToEntity(dataObject); } @Override public List listByPersonnelId(Long personnelId) { @@ -52,7 +56,7 @@ public class OrgPersonnelCertGatewayImpl implements OrgPersonnelCertGateway { wrapper.eq(OrgPersonnelCertDO::getPersonnelId, personnelId); wrapper.eq(OrgPersonnelCertDO::getDeleteEnum, "false"); List dataObjects = orgPersonnelCertMapper.selectList(wrapper); - return dataObjects.stream().map(this::toEntity).collect(Collectors.toList()); + return dataObjects.stream().map(orgPersonnelCertConvertor::doToEntity).collect(Collectors.toList()); } @Override @@ -61,7 +65,7 @@ public class OrgPersonnelCertGatewayImpl implements OrgPersonnelCertGateway { wrapper.eq(OrgPersonnelCertDO::getOrgId, orgId); wrapper.eq(OrgPersonnelCertDO::getDeleteEnum, "false"); List dataObjects = orgPersonnelCertMapper.selectList(wrapper); - return dataObjects.stream().map(this::toEntity).collect(Collectors.toList()); + return dataObjects.stream().map(orgPersonnelCertConvertor::doToEntity).collect(Collectors.toList()); } @Override @@ -108,56 +112,15 @@ public class OrgPersonnelCertGatewayImpl implements OrgPersonnelCertGateway { IPage result = orgPersonnelCertMapper.selectPage(page, wrapper); List entities = result.getRecords().stream() - .map(this::toEntity) + .map(orgPersonnelCertConvertor::doToEntity) .collect(Collectors.toList()); return PageResult.of(entities, result.getTotal(), result.getCurrent(), result.getSize()); } private OrgPersonnelCertDO toDO(OrgPersonnelCertEntity entity) { - OrgPersonnelCertDO dataObject = new OrgPersonnelCertDO(); + OrgPersonnelCertDO dataObject = orgPersonnelCertConvertor.entityToDO(entity); dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId())); - dataObject.setPersonnelId(entity.getPersonnelId()); - dataObject.setCertName(entity.getCertName()); - dataObject.setCertTypeCode(entity.getCertTypeCode()); - dataObject.setCertTypeName(entity.getCertTypeName()); - dataObject.setCertCategoryCode(entity.getCertCategoryCode()); - dataObject.setCertCategoryName(entity.getCertCategoryName()); - dataObject.setOperationCategoryCode(entity.getOperationCategoryCode()); - dataObject.setOperationCategoryName(entity.getOperationCategoryName()); - dataObject.setCertNo(entity.getCertNo()); - dataObject.setIssueOrg(entity.getIssueOrg()); - dataObject.setValidStartDate(entity.getValidStartDate()); - dataObject.setValidEndDate(entity.getValidEndDate()); - dataObject.setReviewDate(entity.getReviewDate()); - dataObject.setCertAttachmentUrl(entity.getCertAttachmentUrl()); - dataObject.setBusinessScope(entity.getBusinessScope()); - dataObject.setTenantId(entity.getTenantId()); return dataObject; } - - private OrgPersonnelCertEntity toEntity(OrgPersonnelCertDO dataObject) { - if (dataObject == null) { - return null; - } - OrgPersonnelCertEntity entity = new OrgPersonnelCertEntity(); - entity.setId(dataObject.getId()); - entity.setPersonnelId(dataObject.getPersonnelId()); - entity.setCertName(dataObject.getCertName()); - entity.setCertTypeCode(dataObject.getCertTypeCode()); - entity.setCertTypeName(dataObject.getCertTypeName()); - entity.setCertCategoryCode(dataObject.getCertCategoryCode()); - entity.setCertCategoryName(dataObject.getCertCategoryName()); - entity.setOperationCategoryCode(dataObject.getOperationCategoryCode()); - entity.setOperationCategoryName(dataObject.getOperationCategoryName()); - entity.setCertNo(dataObject.getCertNo()); - entity.setIssueOrg(dataObject.getIssueOrg()); - entity.setValidStartDate(dataObject.getValidStartDate()); - entity.setValidEndDate(dataObject.getValidEndDate()); - entity.setReviewDate(dataObject.getReviewDate()); - entity.setCertAttachmentUrl(dataObject.getCertAttachmentUrl()); - entity.setBusinessScope(dataObject.getBusinessScope()); - entity.setTenantId(dataObject.getTenantId()); - return entity; - } }