From 1319a1d65bd91d319aa66364d90d886c5d28dc3b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 18 Jan 2022 17:27:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8F=98=E6=9B=B4=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=A1=A8=E5=A2=9E=E5=8A=A0pids=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/IcUserChangeDetailedDTO.java   |  5 +++++
 .../epmet/entity/IcUserChangeDetailedEntity.java |  5 +++++
 .../service/impl/IcResiUserServiceImpl.java      |  7 +++++++
 .../impl/IcUserTransferRecordServiceImpl.java    | 16 ++++++++++++++++
 .../migration/V0.0.24__alter_change_detailed.sql |  3 +++
 5 files changed, 36 insertions(+)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.24__alter_change_detailed.sql

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java
index 2220f907f5..cc4ed1a405 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUserChangeDetailedDTO.java
@@ -49,6 +49,11 @@ public class IcUserChangeDetailedDTO implements Serializable {
      */
 	private String icUserChangeRecordId;
 
+    /**
+     * 组织的所有上级Id
+     */
+    private String pids;
+
     /**
      * 组织Id
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUserChangeDetailedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUserChangeDetailedEntity.java
index 35608feae9..f60a5d1e36 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUserChangeDetailedEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUserChangeDetailedEntity.java
@@ -46,6 +46,11 @@ public class IcUserChangeDetailedEntity extends BaseEpmetEntity {
      */
 	private String icUserChangeRecordId;
 
+    /**
+     * 组织的所有上级Id
+     */
+	private String pids;
+
     /**
      * 组织Id
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index fdd4137135..28036d3a59 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -40,6 +40,7 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 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.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -254,6 +255,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         if (!resultList.success()) {
             throw new RuntimeException("人员新增，获取客户居民类别预警配置表数据失败");
         }
+        AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(map.get("AGENCY_ID"));
+        if (null == agencyInfo) {
+            throw new EpmetException(String.format("查询组织信息失败%s", map.get("AGENCY_ID")));
+        }
         IcUserChangeDetailedEntity outEntity = null;
         for (IcResiCategoryWarnConfigDTO cf : resultList.getData()) {
             if (map.containsKey(cf.getColumnName()) && "1".equals(map.get(cf.getColumnName()))) {
@@ -261,6 +266,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 outEntity = new IcUserChangeDetailedEntity();
                 outEntity.setCustomerId(tokenDto.getCustomerId());
                 outEntity.setIcUserChangeRecordId(icUserChangeRecordId);
+                outEntity.setPids(agencyInfo.getPids());
                 outEntity.setAgencyId(map.get("AGENCY_ID"));
                 outEntity.setGridId(map.get("GRID_ID"));
                 outEntity.setNeighborHoodId(map.get("VILLAGE_ID"));
@@ -399,6 +405,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 //变更明细里边存修改后的新值，是就存1否就存-1
                 categoryEntity = new IcUserChangeDetailedEntity();
                 categoryEntity.setCustomerId(tokenDto.getCustomerId());
+                categoryEntity.setPids(entity.getPids());
                 categoryEntity.setAgencyId(entity.getAgencyId());
                 categoryEntity.setGridId(map.containsKey("GRID_ID") ? map.get("GRID_ID") : entity.getGridId());
                 categoryEntity.setNeighborHoodId(map.containsKey("VILLAGE_ID") ? map.get("VILLAGE_ID") : entity.getVillageId());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
index 1d994dd30c..1e61c9cf54 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java
@@ -19,8 +19,11 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
+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.utils.Result;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcUserTransferRecordDao;
@@ -231,12 +234,24 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
         List<IcUserChangeDetailedEntity> list = new ArrayList<>();
         IcUserChangeDetailedEntity outEntity = null;
         IcUserChangeDetailedEntity inEntity = null;
+        AgencyInfoCache oldAgencyInfo = CustomerOrgRedis.getAgencyInfo(resiUserDTO.getAgencyId());
+        if (null == oldAgencyInfo) {
+            throw new EpmetException(String.format("查询组织信息失败%s", resiUserDTO.getAgencyId()));
+        }
+        AgencyInfoCache newAgencyInfo = new AgencyInfoCache();
+        if ("in".equals(formDTO.getType())) {
+            newAgencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getNewAgencyId());
+            if (null == newAgencyInfo) {
+                throw new EpmetException(String.format("查询组织信息失败%s", formDTO.getNewAgencyId()));
+            }
+        }
         for (IcResiCategoryWarnConfigDTO cf : configList) {
             if ("1".equals(map.get(cf.getColumnName()))) {
                 //迁出
                 outEntity = new IcUserChangeDetailedEntity();
                 outEntity.setCustomerId(formDTO.getCustomerId());
                 outEntity.setIcUserChangeRecordId(icUserChangeRecordId);
+                outEntity.setPids(oldAgencyInfo.getPids());
                 outEntity.setAgencyId(resiUserDTO.getAgencyId());
                 outEntity.setGridId(resiUserDTO.getGridId());
                 outEntity.setNeighborHoodId(resiUserDTO.getVillageId());
@@ -254,6 +269,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans
                     inEntity = new IcUserChangeDetailedEntity();
                     inEntity.setCustomerId(formDTO.getCustomerId());
                     inEntity.setIcUserChangeRecordId(icUserChangeRecordId);
+                    inEntity.setPids(newAgencyInfo.getPids());
                     inEntity.setAgencyId(formDTO.getNewAgencyId());
                     inEntity.setGridId(formDTO.getNewGridId());
                     inEntity.setNeighborHoodId(formDTO.getNewNeighborHoodId());
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.24__alter_change_detailed.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.24__alter_change_detailed.sql
new file mode 100644
index 0000000000..69dda6d4de
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.24__alter_change_detailed.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `ic_user_change_detailed`
+ADD COLUMN `PIDS`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT ''组织的所有上级Id'' AFTER `IC_USER_CHANGE_RECORD_ID`;
+