diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java index d2a1279..d5925ab 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgEquipmentExecutor.java @@ -13,6 +13,8 @@ import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.service.OrgEquipmentDomainService; import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; +import org.qinan.safetyeval.infrastructure.persistence.domainobject.OrgBusinessScopeDeviceRefDO; +import org.qinan.safetyeval.infrastructure.persistence.queryservice.OrgBusinessScopeDeviceRefQueryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -29,6 +31,10 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { @Autowired(required = false) private OrgEquipmentDomainService orgEquipmentDomainService; + @Lazy + @Autowired(required = false) + private OrgBusinessScopeDeviceRefQueryService orgBusinessScopeDeviceRefQueryService; + @Override public SingleResponse add(OrgEquipmentAddCmd cmd) { OrgEquipmentEntity entity = new OrgEquipmentEntity(); @@ -56,7 +62,14 @@ public class OrgEquipmentExecutor implements OrgEquipmentApi { @Override public SingleResponse get(Long id) { OrgEquipmentEntity entity = orgEquipmentDomainService.get(id); - return SingleResponse.success(toCO(entity)); + OrgEquipmentCO co = toCO(entity); + if (co != null && co.getDeviceTypeCode() != null) { + OrgBusinessScopeDeviceRefDO refDO = orgBusinessScopeDeviceRefQueryService.getByDeviceTypeCode(co.getDeviceTypeCode()); + if (refDO != null) { + co.setDeviceTypeName(refDO.getDeviceTypeName()); + } + } + return SingleResponse.success(co); } @Override diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/OrgBusinessScopeDeviceRefQueryService.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/OrgBusinessScopeDeviceRefQueryService.java index 54c6f56..86fb9c9 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/OrgBusinessScopeDeviceRefQueryService.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/OrgBusinessScopeDeviceRefQueryService.java @@ -21,6 +21,14 @@ public interface OrgBusinessScopeDeviceRefQueryService { */ OrgBusinessScopeDeviceRefDO getById(Long id); + /** + * 根据设备类型编码查找 + * + * @param deviceTypeCode 设备类型编码 + * @return + */ + OrgBusinessScopeDeviceRefDO getByDeviceTypeCode(String deviceTypeCode); + /** * 分页查询安全评价机构业务范围与设备参照 * diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/OrgBusinessScopeDeviceRefQueryServiceImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/OrgBusinessScopeDeviceRefQueryServiceImpl.java index b197fee..399c7d1 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/OrgBusinessScopeDeviceRefQueryServiceImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/OrgBusinessScopeDeviceRefQueryServiceImpl.java @@ -32,6 +32,11 @@ public class OrgBusinessScopeDeviceRefQueryServiceImpl implements OrgBusinessSco return orgBusinessScopeDeviceRefRepository.getById(id); } + @Override + public OrgBusinessScopeDeviceRefDO getByDeviceTypeCode(String deviceTypeCode) { + return orgBusinessScopeDeviceRefRepository.getByDeviceTypeCode(deviceTypeCode); + } + @Override public PageResponse listOrgBusinessScopeDeviceRefPage(OrgBusinessScopeDeviceRefPageQry orgBusinessScopeDeviceRefPageQry) { IPage orgBusinessScopeDeviceRefDoPage = orgBusinessScopeDeviceRefRepository.listOrgBusinessScopeDeviceRefPage(PageHelper.queryToPage(orgBusinessScopeDeviceRefPageQry), orgBusinessScopeDeviceRefPageQry); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/OrgBusinessScopeDeviceRefRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/OrgBusinessScopeDeviceRefRepository.java index 514a4aa..5022771 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/OrgBusinessScopeDeviceRefRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/OrgBusinessScopeDeviceRefRepository.java @@ -20,6 +20,14 @@ public interface OrgBusinessScopeDeviceRefRepository extends BaseRepository listOrgBusinessScopeDeviceRefPage(IPage iPage, OrgBusinessScopeDeviceRefPageQry orgBusinessScopeDeviceRefPageQry) { QueryWrapper orgBusinessScopeDeviceRefDoQueryWrapper = new QueryWrapper<>();