From e209a6b90d5d828a5ca334a3551dce42b3063f6e Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 22 Mar 2021 17:20:14 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84-?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E9=95=BF=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=20=E7=9B=B4=E6=8E=A5=E4=BB=8E?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=8F=96=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/RedisKeys.java  | 30 ++++++++++---
 .../resi-group/resi-group-server/pom.xml      |  6 +++
 .../service/impl/ResiGroupServiceImpl.java    | 43 +++++++++++++++++--
 .../resources/mapper/group/ResiGroupDao.xml   |  9 +++-
 .../com/epmet/constant/UserRedisKeys.java     | 38 ----------------
 .../java/com/epmet/redis/UserBadgeRedis.java  |  1 -
 .../com/epmet/redis/UserBaseInfoRedis.java    |  3 +-
 7 files changed, 77 insertions(+), 53 deletions(-)
 delete mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 098dd1c14d..faee6de155 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -9,6 +9,7 @@
 package com.epmet.commons.tools.redis;
 
 import com.epmet.commons.tools.constant.StrConstant;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author Mark sunlightcs@gmail.com
@@ -355,19 +356,34 @@ public class RedisKeys {
 	}
 
 	/**
+	 * @return
+	 * @Description 客户的ApiService
+	 * @author wxz
+	 * @date 2021.01.20 16:56
+	 */
+	public static String getCustomerApiServiceKey(String customerId) {
+		return rootPrefix.concat("customer:thirdplat:apiservice:").concat(customerId);
+	}
+
+	/**
+	 * @return epmet:resi:user:userId
 	 * @Description 用户缓存Key
+	 * @Param 用户Id
+	 * @Author wangc
+	 * @Date 2020.04.13 11:27
 	 **/
-	public static String getResiUserKey(String userId){
+	public static String getResiUserKey(String userId) {
 		return rootPrefix.concat("resi:user:").concat(userId);
 	}
 
 	/**
-	 * @Description 客户的ApiService
-	 * @return
-	 * @author wxz
-	 * @date 2021.01.20 16:56
+	 * @param userId
+	 * @return epmet:badge:user:[customerId]:[userId]
+	 * @Description 用户勋章缓存 epmet:badge:user:[customerId]:[userId]
+	 * @author wangc
+	 * @date 2020.11.05 13:34
 	 */
-	public static String getCustomerApiServiceKey(String customerId) {
-		return rootPrefix.concat("customer:thirdplat:apiservice:").concat(customerId);
+	public static String getResiUserBadgeKey(String customerId, String userId) {
+		return rootPrefix.concat("badge:user:").concat(customerId).concat(":").concat(StringUtils.isBlank(userId) ? "*" : userId);
 	}
 }
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 7f86290566..e7432526b2 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -106,6 +106,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index a4d13430a4..bfa6a16c94 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -17,6 +17,7 @@
 
 package com.epmet.modules.group.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +26,8 @@ import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -34,6 +37,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.*;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -156,6 +160,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 	@Autowired
 	private ResiGroupCodeService resiGroupCodeService;
+	@Autowired
+	private RedisUtils redisUtils;
 
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
@@ -1000,11 +1006,40 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//显示当前网格内所有当前用户还未加入的组，以组的人数由高到低排序；如果人数相同，以话题数由多到少排序
 		List<RecommendedListResultDTO> recommendGroupList = baseDao.selectListRecommendList(formDTO);
 		recommendGroupList.forEach(dto -> {
-			Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(dto.getGroupId());
-			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
-				dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
+			ResiGroupMemberDTO groupMemberDTO = baseDao.selectGroupLeader(dto.getGroupId());
+			if (groupMemberDTO == null) {
+				logger.error("recommendedList 组长信息不存在,groupId:{}", dto.getGroupId());
+				return;
+			}
+			//获取居民缓存key
+			Map<String, Object> map = redisUtils.hGetAll(RedisKeys.getResiUserKey(groupMemberDTO.getCustomerUserId()));
+			UserBaseInfoResultDTO userInfo = null;
+			if (null != map && !map.isEmpty()) {
+				//缓存中有数据，直接返回
+				userInfo = BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true);
+			}
+			if (userInfo == null) {
+				logger.error("recommendedList 用户基础信息不存在,customerUserId:{}", groupMemberDTO.getCustomerUserId());
+				UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
+				resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
+				Result<UserResiInfoResultDTO> groupLeaderUserInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+
+				if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+					dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
+				} else {
+					logger.error("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
+				}
 			} else {
-				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
+				String gender = null;
+				if (NumConstant.ONE_STR.equals(userInfo.getGender())) {
+					gender = "先生";
+				} else if (NumConstant.TWO_STR.equals(userInfo.getGender())) {
+					gender = "女士";
+				} else {
+					gender = "先生/女士";
+				}
+				String leaderName = userInfo.getStreet().concat(StrConstant.HYPHEN).concat(userInfo.getSurname()).concat(gender);
+				dto.setLeaderName(leaderName);
 			}
 		});
 		return recommendGroupList;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index d21ed5ccdd..5ccd3cdb7d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -165,7 +165,14 @@
     <!--  根据组信息查询组张信息  -->
     <select id="selectGroupLeader" parameterType="java.lang.String" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
         SELECT
-            *
+            rgm.ID,
+            rgm.CUSTOMER_USER_ID,
+            rgm.RESI_GROUP_ID,
+            rgm.GROUP_LEADER_FLAG,
+            rgm.ENTER_GROUP_TYPE,
+            rgm.GROUP_INVITATION_ID,
+            rgm.GROUP_LEADER_FLAG,
+            rgm.STATUS
         FROM
             resi_group_member rgm
         WHERE
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java
deleted file mode 100644
index c21ba28c1f..0000000000
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.epmet.constant;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @Description
- * @ClassName UserRedisKeys
- * @Auth wangc
- * @Date 2020-07-22 17:16
- */
-public class UserRedisKeys {
-
-    /**
-     * 党群e事通redis前缀
-     */
-    private static String rootPrefix = "epmet:";
-
-    /**
-     * @Description 用户缓存Key
-     * @Param 用户Id
-     * @return epmet:resi:user:userId
-     * @Author wangc
-     * @Date 2020.04.13 11:27
-     **/
-    public static String getResiUserKey(String userId){
-        return rootPrefix.concat("resi:user:").concat(userId);
-    }
-    
-    /**
-     * @Description 用户勋章缓存 epmet:badge:user:[customerId]:[userId]
-     * @param userId
-     * @return epmet:badge:user:[customerId]:[userId]
-     * @author wangc
-     * @date 2020.11.05 13:34
-    */
-    public static String getResiUserBadgeKey(String customerId,String userId){
-        return rootPrefix.concat("badge:user:").concat(customerId).concat(":").concat( StringUtils.isBlank(userId) ? "*" : userId );}
-}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
index d29a25ec0f..49390b11df 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
@@ -7,7 +7,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.BadgeConstant;
-import com.epmet.constant.UserRedisKeys;
 import com.epmet.dao.BadgeDao;
 import com.epmet.dto.form.UserBadgeUnitFormDTO;
 import com.epmet.dto.result.UserBadgeInfoResultDTO;
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
index 315341ae84..076791fcba 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@@ -22,7 +22,6 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.UserRedisKeys;
 import com.epmet.dao.GridLatestDao;
 import com.epmet.dao.RegisterRelationDao;
 import com.epmet.dao.UserBaseInfoDao;
@@ -389,4 +388,4 @@ public class UserBaseInfoRedis {
             }
         }
     }
-}
\ No newline at end of file
+}

From cbc4ab149b8e41a05db5ec81b861c981a43b7de9 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 22 Mar 2021 17:27:32 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84-?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E9=95=BF=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=20=E7=9B=B4=E6=8E=A5=E4=BB=8E?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=8F=96=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/redis/UserBadgeRedis.java  | 24 +++++++++----------
 .../com/epmet/redis/UserBaseInfoRedis.java    | 11 +++++----
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
index 49390b11df..0ffa41aaa0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java
@@ -1,9 +1,9 @@
 package com.epmet.redis;
 
 
-
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.constant.BadgeConstant;
@@ -109,7 +109,7 @@ public class UserBadgeRedis {
      */
     public List<UserBadgeUnitFormDTO> obtainUserBadge2List(String userId,String customerId) {
         List<UserBadgeUnitFormDTO> cache =
-        redisUtils.lrange(UserRedisKeys.getResiUserBadgeKey(customerId,userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
+                redisUtils.lrange(RedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
         if(!CollectionUtils.isEmpty(cache)) return cache;
         //补偿
         cache = badgeService.getUserSortedBadge(userId,customerId);
@@ -117,7 +117,7 @@ public class UserBadgeRedis {
         final List<UserBadgeUnitFormDTO> sortedBadges = cache;
         redisTemplate.executePipelined((RedisCallback<List<UserBadgeUnitFormDTO>>) connection ->{
             sortedBadges.forEach(badge -> {
-                connection.listCommands().rPush(UserRedisKeys.getResiUserBadgeKey(customerId, userId).getBytes(),
+                connection.listCommands().rPush(RedisKeys.getResiUserBadgeKey(customerId, userId).getBytes(),
                         redisTemplate.getValueSerializer().serialize(badge));
             });
             return null;
@@ -141,7 +141,7 @@ public class UserBadgeRedis {
         List<String> cacheBlank = new LinkedList<>();
         userIds.forEach(userId -> {
             List<UserBadgeUnitFormDTO> badges =
-            redisUtils.lrange(UserRedisKeys.getResiUserBadgeKey(customerId,userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
+                    redisUtils.lrange(RedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
             if(CollectionUtils.isEmpty(badges)){cacheBlank.add(userId);}else{result.put(userId,badges);}
         });
         if(!CollectionUtils.isEmpty(cacheBlank)){
@@ -157,7 +157,7 @@ public class UserBadgeRedis {
 
                     redisTemplate.executePipelined((RedisCallback<List<UserBadgeUnitFormDTO>>) connection ->{
                         covert.forEach(badge -> {
-                            connection.listCommands().rPush(UserRedisKeys.getResiUserBadgeKey(customerId, k).getBytes(),
+                            connection.listCommands().rPush(RedisKeys.getResiUserBadgeKey(customerId, k).getBytes(),
                                     redisTemplate.getValueSerializer().serialize(badge));
                         });
                         return null;
@@ -178,14 +178,14 @@ public class UserBadgeRedis {
      */
     public long pushOrRemoveUserBadge4List(String userId, String badgeId, String customerId) {
         if(StringUtils.isNotBlank(userId)) return illumeOrExtinguishStronglyConsistent(userId,customerId);
-        List<UserBadgeUnitFormDTO> orient = redisUtils.lrange(UserRedisKeys.getResiUserBadgeKey(customerId,userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
+        List<UserBadgeUnitFormDTO> orient = redisUtils.lrange(RedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ZERO, NumConstant.ONE_NEG, UserBadgeUnitFormDTO.class);
         UserBadgeUnitFormDTO unit = null;
 
         if (!CollectionUtils.isEmpty(orient)) {
             Optional<UserBadgeUnitFormDTO> opt = orient.stream().filter(badge -> StringUtils.equals(badgeId, badge.getBadgeId())).findFirst();
             if (opt.isPresent()) {
                 unit = opt.get();
-                return redisUtils.lrem(UserRedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ONE, unit);
+                return redisUtils.lrem(RedisKeys.getResiUserBadgeKey(customerId, userId), NumConstant.ONE, unit);
             }
         }
 
@@ -206,7 +206,7 @@ public class UserBadgeRedis {
                 if (poolOpt.isPresent()) unit = ConvertUtils.sourceToTarget(poolOpt.get(), UserBadgeUnitFormDTO.class);
                 else return NumConstant.ZERO;
             }
-            redisUtils.leftPush(UserRedisKeys.getResiUserBadgeKey(customerId, userId), unit,-1);
+        redisUtils.leftPush(RedisKeys.getResiUserBadgeKey(customerId, userId), unit, -1);
             return NumConstant.ONE;
         }
 
@@ -219,11 +219,11 @@ public class UserBadgeRedis {
     */
     public long illumeOrExtinguishStronglyConsistent(String userId, String customerId){
         List<UserBadgeUnitFormDTO> db = badgeService.getUserSortedBadge(userId,customerId);
-        redisUtils.delete(UserRedisKeys.getResiUserBadgeKey(customerId,userId));
+        redisUtils.delete(RedisKeys.getResiUserBadgeKey(customerId, userId));
         if(CollectionUtils.isNotEmpty(db)) {
             redisTemplate.executePipelined((RedisCallback<List<UserBadgeUnitFormDTO>>) connection -> {
                 db.forEach(badge -> {
-                    connection.listCommands().rPush(UserRedisKeys.getResiUserBadgeKey(customerId, userId).getBytes(),
+                    connection.listCommands().rPush(RedisKeys.getResiUserBadgeKey(customerId, userId).getBytes(),
                             redisTemplate.getValueSerializer().serialize(badge));
                 });
                 return null;
@@ -240,7 +240,7 @@ public class UserBadgeRedis {
          * @date 2020.11.09 10:02
         */
         public void batchClearUserBadgeCache(String customerId){
-            Set<String> key = redisUtils.keys(UserRedisKeys.getResiUserBadgeKey(customerId, null));
+            Set<String> key = redisUtils.keys(RedisKeys.getResiUserBadgeKey(customerId, null));
             if(CollectionUtils.isEmpty(key)) return;
             final Set<String> keys = key;
             redisTemplate.executePipelined((RedisCallback<String>) connection ->{
@@ -256,7 +256,7 @@ public class UserBadgeRedis {
                 @Override
                 public List<String> doInRedis(RedisConnection connection) throws DataAccessException {
                     connection.openPipeline();
-                    Set<byte[]> keys = connection.keys(redisTemplate.getKeySerializer().serialize(UserRedisKeys.getResiUserBadgeKey(customerId, null)));
+                    Set<byte[]> keys = connection.keys(redisTemplate.getKeySerializer().serialize(RedisKeys.getResiUserBadgeKey(customerId, null)));
                     return null;
                 }
             },redisTemplate.getKeySerializer());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
index 076791fcba..d5b8a993eb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java
@@ -19,6 +19,7 @@ package com.epmet.redis;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -79,7 +80,7 @@ public class UserBaseInfoRedis {
     **/
     public void set(UserBaseInfoResultDTO baseInfo){
         if(StringUtils.isBlank(baseInfo.getUserId())) return;
-        String key = UserRedisKeys.getResiUserKey(baseInfo.getUserId());
+        String key = RedisKeys.getResiUserKey(baseInfo.getUserId());
         //bean to map
         Map<String, Object> map = BeanUtil.beanToMap(baseInfo, false, true);
         //用户缓存的有效期为七天
@@ -89,7 +90,7 @@ public class UserBaseInfoRedis {
     public UserBaseInfoResultDTO get(String userId){
 
         if(StringUtils.isNotBlank(userId)) {
-            Map<String, Object> map = redisUtils.hGetAll(UserRedisKeys.getResiUserKey(userId));
+            Map<String, Object> map = redisUtils.hGetAll(RedisKeys.getResiUserKey(userId));
             if (null != map && !map.isEmpty()) {
                 //缓存中有数据，直接返回
                 return BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true);
@@ -109,7 +110,7 @@ public class UserBaseInfoRedis {
     public UserBaseInfoResultDTO getUserInfo(String userId){
         if(StringUtils.isNotBlank(userId)){
             //获取居民缓存key
-            Map<String,Object> map = redisUtils.hGetAll(UserRedisKeys.getResiUserKey(userId));
+            Map<String, Object> map = redisUtils.hGetAll(RedisKeys.getResiUserKey(userId));
             if(null != map && !map.isEmpty()) {
                 //缓存中有数据，直接返回
                 return BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true);
@@ -200,7 +201,7 @@ public class UserBaseInfoRedis {
     public UserBaseInfoResultDTO getUserInfo(String userId,String customerId){
         if(StringUtils.isNotBlank(userId)){
             //获取居民缓存key
-            Map<String,Object> map = redisUtils.hGetAll(UserRedisKeys.getResiUserKey(userId));
+            Map<String, Object> map = redisUtils.hGetAll(RedisKeys.getResiUserKey(userId));
             if(null != map && !map.isEmpty()) {
                 //缓存中有数据，直接返回
                 return BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true);
@@ -363,7 +364,7 @@ public class UserBaseInfoRedis {
     public void clearUserCache(List<String> userIds){
         userIds.forEach(id ->{
             if(StringUtils.isNotBlank(id)) {
-                redisUtils.delete(UserRedisKeys.getResiUserKey(id));
+                redisUtils.delete(RedisKeys.getResiUserKey(id));
             }
         });
     }

From 7d6d8c0e86c04921598f2b7f38b554985f735c7b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 22 Mar 2021 17:42:53 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84-?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E9=95=BF=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=20=E5=A6=82=E6=9E=9C=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E4=B8=8D=E5=9C=A8=E4=BD=BF=E7=94=A8=E5=8E=9F=E6=9D=A5?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/service/impl/ResiGroupServiceImpl.java      | 4 +---
 .../java/com/epmet/controller/UserResiInfoController.java     | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index bfa6a16c94..a6bb7833fc 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -1020,9 +1020,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			}
 			if (userInfo == null) {
 				logger.error("recommendedList 用户基础信息不存在,customerUserId:{}", groupMemberDTO.getCustomerUserId());
-				UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
-				resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
-				Result<UserResiInfoResultDTO> groupLeaderUserInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+				Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(dto.getGroupId());
 
 				if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 					dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
index e4f54f6aa7..a8fc12840e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
@@ -33,7 +33,6 @@ import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
 import com.epmet.service.UserResiInfoService;
-import jdk.nashorn.internal.parser.Token;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

From 2d3231993e41169c168717fe89e1e9ba3b2c335e Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 23 Mar 2021 09:37:51 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=20=20=E8=BF=94=E5=9B=9E=E5=85=B7=E4=BD=93=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserWechatDao.xml          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
index f59dc05973..4c2adabf2f 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@@ -59,7 +59,12 @@
     <!--  根据app、openId查询用户是否存在  -->
     <select id="selectUserDTOByOpenId" parameterType="com.epmet.dto.form.WxLoginUserInfoFormDTO" resultType="com.epmet.dto.UserDTO">
         SELECT
-            u.*
+            u.ID,
+            u.CUSTOMER_ID,
+            u.FROM_APP,
+            u.FROM_CLIENT,
+            u.CREATED_TIME,
+            u.CREATED_BY
         FROM
             USER u
             LEFT JOIN user_wechat uw ON (
@@ -73,7 +78,7 @@
 
     <select id="selectByUserId" parameterType="string" resultType="com.epmet.entity.UserWechatEntity">
         SELECT *
-        
+
         FROM
               USER_WECHAT
         WHERE

From a1636d49336f9fe855d9c7d9b09b36304999efb2 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 23 Mar 2021 10:39:10 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/filter/LogMsgSendFilter.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
index 942e4a6570..0651951d56 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
@@ -123,6 +123,9 @@ public class LogMsgSendFilter extends LevelFilter {
         try {
             if (serverIp == null) {
                 InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
+                if (inetUtils.findFirstNonLoopbackHostInfo() == null){
+                    return;
+                }
                 serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
             }
         } catch (Exception e) {

From 4945189426e524eb9361764b700ee74b593c2481 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 23 Mar 2021 15:44:28 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E9=BE=99=E6=B9=BE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E5=B8=83=E6=8E=A5=E5=8F=A3=E9=BB=98=E8=AE=A4=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E8=BD=AC=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4=E9=99=8D?=
 =?UTF-8?q?=E5=BA=8F=E8=BF=94=E5=9B=9E=E5=89=8D20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../govproject/form/ProjectDistributionFormDTO.java | 13 +++++++++++++
 .../dataaggre/service/govissue/GovIssueService.java |  2 +-
 .../service/govissue/impl/GovIssueServiceImpl.java  |  9 +++++++--
 .../govproject/impl/GovProjectServiceImpl.java      |  2 +-
 .../src/main/resources/mapper/govissue/IssueDao.xml |  2 +-
 .../main/resources/mapper/govproject/ProjectDao.xml |  1 -
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectDistributionFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectDistributionFormDTO.java
index f1f25aeb05..4e6f37f537 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectDistributionFormDTO.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/form/ProjectDistributionFormDTO.java
@@ -13,7 +13,20 @@ import java.io.Serializable;
  */
 @Data
 public class ProjectDistributionFormDTO implements Serializable {
+    /**
+     * 网格id不必填
+     */
     private String gridId;
     @NotBlank(message = "customerId不能为空")
     private String customerId;
+
+    /**
+     * 默认1
+     */
+    private Integer pageNo;
+
+    /**
+     * 默认20
+     */
+    private Integer pageSize;
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
index b3a96f917c..5159bda48f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/GovIssueService.java
@@ -44,5 +44,5 @@ public interface GovIssueService {
      **/
     List<ClosedIssueListResultDTO> closedIssueList(ClosedIssueListFormDTO fromDTO);
 
-    List<IssueInfoDTO> selectShiftProjectIssueList(String customerId,String gridId);
+    List<IssueInfoDTO> selectShiftProjectIssueList(String customerId,String gridId,Integer pageNo,Integer pageSize);
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
index e379b75a38..7b68d96332 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govissue/impl/GovIssueServiceImpl.java
@@ -314,8 +314,13 @@ public class GovIssueServiceImpl implements GovIssueService {
     }
 
     @Override
-    public List<IssueInfoDTO> selectShiftProjectIssueList(String customerId,String gridId) {
-        return issueDao.selectShiftProjectIssueList(customerId,gridId);
+    public List<IssueInfoDTO> selectShiftProjectIssueList(String customerId, String gridId, Integer pageNo, Integer pageSize) {
+        if (pageNo != null && pageSize != null) {
+            PageHelper.startPage(pageNo, pageSize);
+        }else{
+            PageHelper.startPage(NumConstant.ONE, NumConstant.TWENTY);
+        }
+        return issueDao.selectShiftProjectIssueList(customerId, gridId);
     }
 
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index cc664bf225..abc34e5c5c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -114,7 +114,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 	@Override
 	public List<ProjectDistributionResultDTO> queryProjectDistribution(ProjectDistributionFormDTO formDTO) {
 		List<ProjectDistributionResultDTO> resultDTOList = new ArrayList<>();
-		List<IssueInfoDTO> issueInfoDTOList = govIssueService.selectShiftProjectIssueList(formDTO.getCustomerId(), formDTO.getGridId());
+		List<IssueInfoDTO> issueInfoDTOList = govIssueService.selectShiftProjectIssueList(formDTO.getCustomerId(), formDTO.getGridId(),formDTO.getPageNo(),formDTO.getPageSize());
 		if (CollectionUtils.isNotEmpty(issueInfoDTOList)) {
 			List<String> topicIds = issueInfoDTOList.stream().map(data -> data.getTopicId()).collect(Collectors.toList());
 			// log.info("话题id集合:" + JSON.toJSONString(topicIds, true));
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
index 44c2924ba8..185816c9bb 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govissue/IssueDao.xml
@@ -122,6 +122,6 @@
             <if test="gridId != null and gridId.trim() != ''">
                 AND i.GRID_ID = #{gridId}
             </if>
-            order by i.SHIFTED_TIME desc limit 100
+            order by i.SHIFTED_TIME desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
index f171a790e3..eb4c0e2d93 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
@@ -140,6 +140,5 @@
             <foreach item="issueId" collection="list" separator="," open="(" close=")" index="">
                 #{issueId}
             </foreach>
-            order by CREATED_TIME desc limit 100
     </select>
 </mapper>
\ No newline at end of file

From 03c1760144b88c2270664f766aeaf7701645a5e8 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 23 Mar 2021 17:55:33 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=9B=BF=E6=8D=A2feign=E7=9A=84client?=
 =?UTF-8?q?=E7=AB=AF-=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-auth/src/main/resources/bootstrap.yml                     | 2 +-
 .../main/java/com/epmet/commons/tools/feign/FeignConfig.java    | 2 +-
 .../data-aggregator-server/src/main/resources/bootstrap.yml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml
index edab1bde4e..b7cc83fd9c 100644
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@@ -71,7 +71,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
index f7ae3265d0..c68dbc2913 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/FeignConfig.java
@@ -53,6 +53,6 @@ public class FeignConfig implements RequestInterceptor {
 
     @Bean
     Logger.Level feignLoggerLevel() {
-        return Logger.Level.FULL;//控制台会输出debug日志
+        return Logger.Level.BASIC;//控制台会输出debug日志
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index 55e3265590..50e01db7ee 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@@ -127,7 +127,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:

From 3cd831408cc1d5ec8d82f99b08acda997ba52173 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 23 Mar 2021 18:02:48 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=9B=BF=E6=8D=A2feign=E7=9A=84client?=
 =?UTF-8?q?=E7=AB=AF=E4=BD=BF=E7=94=A8okhttp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml | 2 +-
 epmet-gateway/src/main/resources/bootstrap.yml                  | 2 +-
 .../data-report-server/src/main/resources/bootstrap.yml         | 2 +-
 .../data-statistical-server/src/main/resources/bootstrap.yml    | 2 +-
 .../epmet-activiti-server/src/main/resources/bootstrap.yml      | 2 +-
 .../common-service-server/src/main/resources/bootstrap.yml      | 2 +-
 .../epmet-demo-server/src/main/resources/bootstrap.yml          | 2 +-
 .../epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml | 2 +-
 .../epmet-heart-server/src/main/resources/bootstrap.yml         | 2 +-
 .../epmet-job/epmet-job-server/src/main/resources/bootstrap.yml | 2 +-
 .../epmet-message-server/src/main/resources/bootstrap.yml       | 2 +-
 .../epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml | 2 +-
 .../epmet-point-server/src/main/resources/bootstrap.yml         | 2 +-
 .../epmet-third-server/src/main/resources/bootstrap.yml         | 2 +-
 .../gov-access-server/src/main/resources/bootstrap.yml          | 2 +-
 .../gov-grid/gov-grid-server/src/main/resources/bootstrap.yml   | 2 +-
 .../gov-issue/gov-issue-server/src/main/resources/bootstrap.yml | 2 +-
 .../gov-mine/gov-mine-server/src/main/resources/bootstrap.yml   | 2 +-
 .../gov-org/gov-org-server/src/main/resources/bootstrap.yml     | 2 +-
 .../gov-project-server/src/main/resources/bootstrap.yml         | 2 +-
 .../gov-voice/gov-voice-server/src/main/resources/bootstrap.yml | 2 +-
 .../oper-access-server/src/main/resources/bootstrap.yml         | 2 +-
 .../oper-crm/oper-crm-server/src/main/resources/bootstrap.yml   | 2 +-
 .../oper-customize-server/src/main/resources/bootstrap.yml      | 2 +-
 .../resi-group-server/src/main/resources/bootstrap.yml          | 2 +-
 .../resi-guide-server/src/main/resources/bootstrap.yml          | 2 +-
 .../resi-hall/resi-hall-server/src/main/resources/bootstrap.yml | 2 +-
 .../resi-home/resi-home-server/src/main/resources/bootstrap.yml | 2 +-
 .../resi-mine/resi-mine-server/src/main/resources/bootstrap.yml | 2 +-
 .../resi-partymember-server/src/main/resources/bootstrap.yml    | 2 +-
 .../resi-voice-server/src/main/resources/bootstrap.yml          | 2 +-
 .../epmet-openapi-adv-server/src/main/resources/bootstrap.yml   | 2 +-
 .../epmet-openapi-scan/src/main/resources/bootstrap.yml         | 2 +-
 epmet-user/epmet-user-server/src/main/resources/bootstrap.yml   | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
index 152e65a3e0..89f42ed404 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
@@ -113,7 +113,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 7a6c236128..201573688e 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -419,7 +419,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
index 4b220e0c72..3ecb0ec3d1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
@@ -118,7 +118,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
index bc14f070f8..f94ee99777 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
@@ -99,7 +99,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
index 110490c3af..811f0c352b 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
@@ -93,7 +93,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
index 8348460f3f..ff4ec82dcf 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml
@@ -100,7 +100,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
index e131231414..b9cf8dd559 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
@@ -83,7 +83,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
index 7a067d1606..1ed5a4306d 100644
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml
@@ -81,7 +81,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
index 2cd6e68458..8fe49b4ea0 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
@@ -99,7 +99,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
index 85974efb60..20fc7cb138 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@@ -100,7 +100,7 @@ feign:
     config:
       default:
         loggerLevel: FULL
-  httpclient:
+  okhttp:
     enabled: true
 
 logging:
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
index b361be7236..03945c0ebf 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
@@ -101,7 +101,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
index 5b6b4b9e75..3bfe0d68bc 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
@@ -111,7 +111,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
index a6233bb7a3..08cae6a575 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
@@ -99,7 +99,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
index 0606e7f123..70ea9ad34a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
@@ -81,7 +81,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
index c8fe1196c9..d2038e569e 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml
@@ -100,7 +100,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
index 241ae97b26..4afc1b94e4 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
@@ -57,7 +57,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
index 06974a6810..f1b74c03df 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml
@@ -89,7 +89,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
index 6c3a83e1f1..1cfa2f121e 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml
@@ -81,7 +81,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
index 0a9653fd28..8baed16dd6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
@@ -113,7 +113,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
index 2db2f15416..74f392af96 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml
@@ -89,7 +89,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
index c570e30147..8b8c4bdb45 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml
@@ -89,7 +89,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
index 15ccaab5b1..f7bad85d13 100644
--- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
@@ -100,7 +100,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
index f8760dbee8..3d0b42162e 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
@@ -106,7 +106,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
index 360e2ad6e2..f9ee219699 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
@@ -100,7 +100,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
index 6823a772e7..35cade577d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
@@ -100,7 +100,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
index 9be4ac049f..a8a75e8d97 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
@@ -101,7 +101,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
index 09b4ba2437..19a4ef53b8 100644
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml
@@ -57,7 +57,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
index 76f5542795..72ede48632 100644
--- a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
@@ -56,7 +56,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
index 48dc370737..7257f2ea6f 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml
@@ -84,7 +84,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
index 4577b0cae3..0978c177e1 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml
@@ -100,7 +100,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
index b1bca8e761..9d398946ba 100644
--- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml
@@ -52,7 +52,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:
diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
index 3a3726f148..0bd40dcca7 100644
--- a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
+++ b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/src/main/resources/bootstrap.yml
@@ -113,7 +113,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
index 0c5c04d86e..0aa0583c97 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
+++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml
@@ -55,7 +55,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 
diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
index 0ff8f5dcc1..bb127328eb 100644
--- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
+++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
@@ -113,7 +113,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 

From ca2ef72f1598003d3413bd2ed900c16abdffd059 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 23 Mar 2021 18:27:04 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=9E=83=E5=9C=BE=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=B8=85=E7=90=86-=E6=B3=A8=E9=87=8A=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=B7=B2=E7=BB=8F=E6=8C=AA=E5=88=B0=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E9=87=8C=EF=BC=8C=E6=97=A0=E9=9C=80=E5=9C=A8?=
 =?UTF-8?q?=E8=BF=99=E6=94=BE=E7=9D=80=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserAccessServiceImpl.java   | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java
index 3aea2fc5ee..1b1aa4c53d 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java
@@ -3,7 +3,6 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.StrangerResiGuideConstant;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.form.UserEnterGridFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
@@ -38,26 +37,6 @@ public class UserAccessServiceImpl implements UserAccessService {
         userInfoParams.setGridId(formDTO.getGridId());
         Result<UserInfoOnEnterGridResultDTO> userInfoResult =
                 epmetUserFeignClient.getUserInfoAndRoles(userInfoParams);
-        if(userInfoResult.success()){
-            //2:调用epmet-user服务查询数据 新建网格记录数据
-            /*VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
-            visitedFormDTO.setGridId(userInfoParams.getGridId());
-            visitedFormDTO.setCustomerId(userInfoParams.getCustomerId());
-            visitedFormDTO.setUserId(userInfoParams.getUserId());
-            if(null != userInfoResult.getData().getUserRoleList() && userInfoResult.getData().getUserRoleList().size() > 0){
-                visitedFormDTO.setIsReg(NumConstant.ONE_STR);
-            }else{
-                visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
-            }
-            Result re = epmetUserFeignClient.saveVisitedRecord(visitedFormDTO);
-            if (!re.success()) {
-                log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
-            }*/
-        }else{
-            //getUserInfoAndRoles调用失败
-            log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
-        }
-
         return userInfoResult;
     }
 }

From 23c3c414c48afcede89f43ce0d28e3c8a73ec433 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 23 Mar 2021 22:51:59 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E4=B8=8D=E4=B8=80=E8=87=B4=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserWechatDao.xml            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
index 4c2adabf2f..1ec439f398 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@@ -59,12 +59,7 @@
     <!--  根据app、openId查询用户是否存在  -->
     <select id="selectUserDTOByOpenId" parameterType="com.epmet.dto.form.WxLoginUserInfoFormDTO" resultType="com.epmet.dto.UserDTO">
         SELECT
-            u.ID,
-            u.CUSTOMER_ID,
-            u.FROM_APP,
-            u.FROM_CLIENT,
-            u.CREATED_TIME,
-            u.CREATED_BY
+            u.*
         FROM
             USER u
             LEFT JOIN user_wechat uw ON (

From 5905f69f4afec5df3fe1f857a4d73ef70378cdec Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 24 Mar 2021 11:22:14 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=B8=8D=E4=BB=8E=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=8F=96=20=E4=BA=86=E5=9B=A0=E4=B8=BA=E9=BA=BB=E7=83=A6=20?=
 =?UTF-8?q?=E4=B8=8D=E8=A7=81=E5=BE=97=E6=95=88=E7=8E=87=E9=AB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiGroupServiceImpl.java    | 49 +++----------------
 1 file changed, 8 insertions(+), 41 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index a6bb7833fc..ae929c6de9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -17,7 +17,6 @@
 
 package com.epmet.modules.group.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -26,18 +25,18 @@ import com.epmet.commons.tools.constant.*;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.redis.RedisKeys;
-import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
 import com.epmet.commons.tools.scan.param.TextTaskDTO;
 import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -146,9 +145,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private LoginUserUtil loginUserUtil;
 
-	@Autowired
-	private CpUserDetailRedis sysUserInfoRedis;
-
 	@Value("${openapi.scan.server.url}")
 	private String scanApiUrl;
 
@@ -160,8 +156,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 
 	@Autowired
 	private ResiGroupCodeService resiGroupCodeService;
-	@Autowired
-	private RedisUtils redisUtils;
 
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
@@ -1006,38 +1000,11 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//显示当前网格内所有当前用户还未加入的组，以组的人数由高到低排序；如果人数相同，以话题数由多到少排序
 		List<RecommendedListResultDTO> recommendGroupList = baseDao.selectListRecommendList(formDTO);
 		recommendGroupList.forEach(dto -> {
-			ResiGroupMemberDTO groupMemberDTO = baseDao.selectGroupLeader(dto.getGroupId());
-			if (groupMemberDTO == null) {
-				logger.error("recommendedList 组长信息不存在,groupId:{}", dto.getGroupId());
-				return;
-			}
-			//获取居民缓存key
-			Map<String, Object> map = redisUtils.hGetAll(RedisKeys.getResiUserKey(groupMemberDTO.getCustomerUserId()));
-			UserBaseInfoResultDTO userInfo = null;
-			if (null != map && !map.isEmpty()) {
-				//缓存中有数据，直接返回
-				userInfo = BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true);
-			}
-			if (userInfo == null) {
-				logger.error("recommendedList 用户基础信息不存在,customerUserId:{}", groupMemberDTO.getCustomerUserId());
-				Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(dto.getGroupId());
-
-				if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
-					dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
-				} else {
-					logger.error("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
-				}
+			Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(dto.getGroupId());
+			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
+				dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 			} else {
-				String gender = null;
-				if (NumConstant.ONE_STR.equals(userInfo.getGender())) {
-					gender = "先生";
-				} else if (NumConstant.TWO_STR.equals(userInfo.getGender())) {
-					gender = "女士";
-				} else {
-					gender = "先生/女士";
-				}
-				String leaderName = userInfo.getStreet().concat(StrConstant.HYPHEN).concat(userInfo.getSurname()).concat(gender);
-				dto.setLeaderName(leaderName);
+				logger.error("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
 			}
 		});
 		return recommendGroupList;

From 12a5d2243505d7ac87b49a0f6989d4b121f4df24 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 24 Mar 2021 15:02:54 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E7=AD=9B=E9=80=89=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extract/FactOriginProjectMainDailyDao.xml | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
index 89ba03036c..675cce9c31 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
@@ -395,23 +395,25 @@
         LEFT JOIN
         (
 
-        SELECT
-
-        project.ID AS projectId,
-        IF(project.project_status = 'closed',period.handled_date,NOW()) AS finishDate
-
-        FROM fact_origin_project_main_daily project LEFT JOIN fact_origin_project_org_period_daily period
-        ON project.ID = period.project_id AND period.del_flag = '0' AND period.customer_id = #{customerId}
-         AND period.operation = 'close'
-        WHERE project.customer_id = #{customerId} AND project.del_flag = '0'
-        ) projectFinishDate ON projectFinishDate.projectId = period.project_id
-
-        WHERE
-            period.del_flag = '0'
+             SELECT
+            project.ID AS projectId,
+            IFNULL(period.handled_date,NOW()) AS finishDate
+        FROM
+            fact_origin_project_main_daily project
+            LEFT JOIN fact_origin_project_org_period_daily period ON project.ID = period.project_id
+            AND period.del_flag = '0'
             AND period.customer_id = #{customerId}
-            AND TIMESTAMPDIFF( DAY, period.informed_date, projectFinishDate.finishDate) > #{thresholdValue}
-            )
+            AND period.operation = 'close'
+        WHERE
+            project.customer_id = #{customerId}
+            AND project.del_flag = '0'
+                ) projectFinishDate ON projectFinishDate.projectId = period.project_id
 
+                WHERE
+                    period.del_flag = '0'
+                    AND period.customer_id = #{customerId}
+                    AND TIMESTAMPDIFF( DAY, period.informed_date, IFNULL(period.handled_date,projectFinishDate.finishDate)) > #{thresholdValue}
+                    )
     </select>
 
 <!-- 查询当天新立的项目，是为了增量新增难点赌点的图片库 -->

From 2a6bf3cf8eb59a6b2c0f3da3303b5e895a3abd14 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 24 Mar 2021 15:07:33 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9?=
 =?UTF-8?q?=E4=B8=8D=E7=94=A8=E5=8D=95=E7=8B=AC=E6=9B=B4=E6=96=B0dataEndTi?=
 =?UTF-8?q?me?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/ScreenDifficultyDataServiceImpl.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
index 66873e1b6d..f263b332fc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
@@ -66,7 +66,7 @@ public class ScreenDifficultyDataServiceImpl extends BaseServiceImpl<ScreenDiffi
         if (!CollectionUtils.isEmpty(imgs)) {
             baseDao.insertBatchImg(imgs);
         }
-        baseDao.updateTime(customerId, DateUtils.getBeforeNDay(NumConstant.ONE));
+        //baseDao.updateTime(customerId, DateUtils.getBeforeNDay(NumConstant.ONE));
     }
 
     /**