From 420dde575a223a4902b2324f2a5bd9525963bb73 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 22 Jun 2022 14:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=96=B0=E5=A2=9E=E9=80=94?= =?UTF-8?q?=E5=BE=84=E6=B7=BB=E5=8A=A0orgIdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/ImportGeneralDTO.java | 2 ++ .../java/com/epmet/controller/HouseController.java | 2 -- .../java/com/epmet/model/ImportHouseInfoListener.java | 5 +++++ .../java/com/epmet/service/impl/HouseServiceImpl.java | 11 +++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index ca5408d581..8f4783e7e7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -28,6 +28,8 @@ public class ImportGeneralDTO implements Serializable { private String pid; private String pids; + private String orgIdPath; + /** * 网格名、ID */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 6e99cd25f7..da97859fb9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -170,8 +170,6 @@ public class HouseController implements ResultDataResolver { //效验数据 ValidatorUtils.validateEntity(formDTO, IcHouseAddFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - houseService.addHouse(customerId, formDTO); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 2d9bb999e8..c3bbe3dc76 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -3,6 +3,7 @@ package com.epmet.model; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; @@ -237,6 +238,10 @@ public class ImportHouseInfoListener extends AnalysisEventListener { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(n.getGridId()); + n.setOrgIdPath(gridInfo.getPids().concat(":").concat(gridInfo.getId())); + }); // 根据单元ID_doorName查询已存在的 List ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList()); List existHouses = icBuildingDao.selectExistHouse(ids); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index e329260f69..1c042a9285 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -20,6 +20,7 @@ import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -147,6 +148,16 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { areaCode = numberAfterFillZero(areaCode, NumConstant.TWELVE); icHouseDTO.setHouseCode(createHouseCode(customerId, formDTO.getBuildingId(), areaCode)); } + // 补充orgIdPath + IcNeighborHoodEntity icNeighborHoodEntity = icNeighborHoodDao.selectById(icHouseDTO.getNeighborHoodId()); + if (null == icNeighborHoodEntity){ + throw new EpmetException("小区不存在："+icHouseDTO.getNeighborHoodId()); + } + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(icNeighborHoodEntity.getGridId()); + if (null == gridInfo){ + throw new EpmetException("网格信息不存在："+icNeighborHoodEntity.getId()); + } + icHouseDTO.setOrgIdPath(gridInfo.getPids().concat(":").concat(gridInfo.getId())); icHouseDao.insert(icHouseDTO); IcHouseEntity entity = new IcHouseEntity(); entity.setId(icHouseDTO.getId());