From f20223a90adb8c428a9c2fdea28d397e8376e97a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 5 Dec 2022 15:28:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8Emate=5Fsys=5Fdept=E8=A1=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/service/impl/ItemServiceImpl.java | 30 ++++++++++++------- .../impl/PushToCityGridServiceImpl.java | 12 +++++--- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 1edbea15b..a384ae41b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -47,7 +47,6 @@ import com.elink.esua.epdc.constants.MenuCodeConstant; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.EventsCategoryDTO; import com.elink.esua.epdc.dto.events.form.GroupFormDTO; @@ -96,6 +95,8 @@ import com.elink.esua.epdc.modules.item.service.*; import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; +import com.elink.esua.epdc.modules.screen.dao.MetaSysDeptDao; +import com.elink.esua.epdc.modules.screen.entity.MetaSysDeptEntity; import com.elink.esua.epdc.user.dto.UserDTO; import com.google.common.collect.Lists; import lombok.SneakyThrows; @@ -223,6 +224,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem private ItemAutoProcessRedis itemAutoProcessRedis; @Resource private ItemReportInterfaceLogDao itemReportInterfaceLogDao; + @Resource + private MetaSysDeptDao metaSysDeptDao; // @Autowired // private ItemProcessModifyProducer itemProcessModifyProducer; @@ -2940,16 +2943,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridDelayhour(dto.getDELAYHOUR()); itemHandleProcessDto.setGridDelayresult(ItemGridPlatformDictEnum.getValueByName(dto.getDELAYRESULT())); if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { - Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); - SysDeptAreaCodeResultDTO dept = result.getData(); + LambdaQueryWrapper deptWrapper = new LambdaQueryWrapper<>(); + deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode()); + MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper); if (dept != null) { itemHandleProcessDto.setDisCenterZoningCode(dept.getDisCenterZoningCode()); } } if (StringUtils.isNotBlank(itemHandleProcessDto.getGridNextcantoncode())) { - Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridNextcantoncode()); - SysDeptAreaCodeResultDTO dept = result.getData(); + LambdaQueryWrapper deptWrapper = new LambdaQueryWrapper<>(); + deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridNextcantoncode()); + MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper); if (dept != null) { itemHandleProcessDto.setNextDisCenterZoningCode(dept.getDisCenterZoningCode()); } @@ -3972,8 +3977,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode()); //根据网格化区域编码获取对应的市中心区域编码 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { - Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); - SysDeptAreaCodeResultDTO dept = result.getData(); + LambdaQueryWrapper deptWrapper = new LambdaQueryWrapper<>(); + deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode()); + MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper); if (dept != null) { String zoneCode = dept.getDisCenterZoningCode(); itemHandleProcessDto.setDisCenterZoningCode(zoneCode); @@ -4148,8 +4154,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode()); //根据网格化区域编码获取对应的市中心区域编码 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { - Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); - SysDeptAreaCodeResultDTO dept = result.getData(); + LambdaQueryWrapper deptWrapper = new LambdaQueryWrapper<>(); + deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode()); + MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper); if (dept != null) { String zoneCode = dept.getDisCenterZoningCode(); itemHandleProcessDto.setDisCenterZoningCode(zoneCode); @@ -5089,8 +5096,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridCantoncode(formDto.getGridCantoncode()); //根据网格化区域编码获取对应的市中心区域编码 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { - Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); - SysDeptAreaCodeResultDTO dept = result.getData(); + LambdaQueryWrapper deptWrapper = new LambdaQueryWrapper<>(); + deptWrapper.eq(MetaSysDeptEntity::getAreaCode, itemHandleProcessDto.getGridCantoncode()); + MetaSysDeptEntity dept = metaSysDeptDao.selectOne(deptWrapper); if (dept != null) { String zoneCode = dept.getDisCenterZoningCode(); itemHandleProcessDto.setDisCenterZoningCode(zoneCode); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index 339c957e2..e6490960a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -55,6 +55,8 @@ import com.elink.esua.epdc.modules.item.dao.*; import com.elink.esua.epdc.modules.item.entity.*; import com.elink.esua.epdc.modules.item.service.ItemService; import com.elink.esua.epdc.modules.item.service.PushToCityGridService; +import com.elink.esua.epdc.modules.screen.dao.MetaSysDeptDao; +import com.elink.esua.epdc.modules.screen.entity.MetaSysDeptEntity; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; @@ -107,6 +109,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { private ImgDao imgDao; @Resource private ItemReportErrorLogDao itemReportErrorLogDao; + @Resource + private MetaSysDeptDao metaSysDeptDao; @Override public void appealDispatch(ItemHandleProcessDTO formDTO) { @@ -1321,12 +1325,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { } CityCenterFromDTO formDTO = new CityCenterFromDTO(); formDTO.setDeptId(deptId); - Result dept = adminFeignClient.getDept(formDTO); - if (dept.success()) { + MetaSysDeptEntity dept = metaSysDeptDao.selectById(deptId); + if (null != dept) { if (NumConstant.ZERO_STR.equals(type)) { - return dept.getData() == null ? "" : dept.getData().getDisCenterZoningCode(); + return dept.getDisCenterZoningCode(); } else { - return dept.getData() == null ? "" : dept.getData().getName(); + return dept.getName(); } } return "";