Merge branch 'master' into lingshan_master

# Conflicts:
#	epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml

doc/epmet-cloud.md

@@ -11,3 +11,10 @@
 如果需要开发AB2个服务，那么将A中的FeignClient的url属性指向localhost。
 PS:目前正在测试通过负载均衡器和本地环境变量实现动态修改目标服务IP，成功之后就不需要再修改FeignClient的url，配置一下环境变量即可，到时候具体说
 ```
+
+
+## 私有化部署 
+##### 需要开放哪些域名
+
+- epmet-cloud.elinkservice.cn   微信交互代理
+- dysmsapi.aliyuncs.com   阿里云短信

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -708,7 +708,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             throw new RenException(String.format("居民信息修改，获取基础信息失败，基础信息Id->", resiUserId));
         }
         //2022-1-18 信息修改判断基础信息表人员网格、小区、楼栋、单元、房屋维度数据以及十八类的类别数据是否变化，相应生成变更记录和变更明细数据  sun  start
-        icUserChangeRecord(tokenDto, entity, map);
+        icUserChangeRecord(entity, map);
         //2022-1-18  sun end
         //2.更新主表数据
         if (map.size() > NumConstant.ONE) {
@@ -789,10 +789,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
     /**
-     * @Author sun
-     * @Description 居民信息修改--生成变更记录和变更明细
-     **/
-    private void icUserChangeRecord(TokenDto tokenDto, IcResiUserEntity entity, LinkedHashMap<String, String> map) {
+     * @description: 生成居民变更记录
+     * @param null:
+     * @return
+     * @author: sun
+     */
+    public void icUserChangeRecord(IcResiUserEntity entity, LinkedHashMap<String, String> map) {
+        // prepare
+        String customerId = EpmetRequestHolder.getLoginUserCustomerId();
+        String staffId = EpmetRequestHolder.getLoginUserId();
+
         java.util.Date date = new java.util.Date();
         //1.判断维度数据是否修改【网格、小区、楼栋、单元、房间有变化则先走人员调动逻辑】
         if ((map.containsKey("GRID_ID") && !entity.getGridId().equals(map.get("GRID_ID"))) || (map.containsKey("VILLAGE_ID") && !entity.getVillageId().equals(map.get("VILLAGE_ID")))
@@ -809,13 +815,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             formDTO.setNewHouseId(map.containsKey("HOME_ID") ? map.get("HOME_ID") : entity.getHomeId());
             formDTO.setTransferTime(date);
             formDTO.setIdEdit(false);
-            formDTO.setCustomerId(tokenDto.getCustomerId());
-            formDTO.setStaffId(tokenDto.getUserId());
+            formDTO.setCustomerId(customerId);
+            formDTO.setStaffId(staffId);
             icUserTransferRecordService.add(formDTO);
         }
         //2.判断类别数据是否修改[类别修改的变更明细里边存修改后的新值，是就存1否就存-1]
         IcResiCategoryStatsConfigDTO sfdto = new IcResiCategoryStatsConfigDTO();
-        sfdto.setCustomerId(tokenDto.getCustomerId());
+        sfdto.setCustomerId(customerId);
         Result<List<IcResiCategoryStatsConfigDTO>> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(sfdto);
         if (!categoryListResult.success()) {
             throw new RenException("居民信息修改，获取客户居民类别预警配置表数据失败");
@@ -840,7 +846,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 afterChangeName.append(dto.getLabel()).append(":").append("1".equals(newVlaue) ? "是" : "否").append(";");
                 //变更明细里边存修改后的新值，是就存1否就存-1
                 categoryEntity = new IcUserChangeDetailedEntity();
-                categoryEntity.setCustomerId(tokenDto.getCustomerId());
+                categoryEntity.setCustomerId(customerId);
                 categoryEntity.setPids(entity.getPids());
                 categoryEntity.setAgencyId(entity.getAgencyId());
                 categoryEntity.setGridId(map.containsKey("GRID_ID") ? map.get("GRID_ID") : entity.getGridId());
@@ -859,9 +865,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         //居民信息修改中有类别修改的才会生成变更记录和变更明细
         if (list.size() > NumConstant.ZERO) {
             //变更记录
-            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
-            changeRecordEntity.setCustomerId(tokenDto.getCustomerId());
-            changeRecordEntity.setOperatorId(tokenDto.getUserId());
+            CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+            changeRecordEntity.setCustomerId(customerId);
+            changeRecordEntity.setOperatorId(staffId);
             changeRecordEntity.setIcUserId(entity.getId());
             changeRecordEntity.setOperatorName(staffInfoCache.getRealName());
             changeRecordEntity.setIcUserName(map.containsKey("NAME") ? map.get("NAME") : entity.getName());