Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_318_wangc

epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@@ -113,7 +113,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 

epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@@ -166,7 +166,7 @@ public class SsoServiceImpl implements SsoService {
         //test end
 
         if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {
-            logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在");
+            logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在,param:{}", JSON.toJSONString(form));
             throw new RenException(EpmetErrorCode.ERR10003.getCode());
         }
 

epmet-auth/src/main/resources/bootstrap.yml

@@ -71,7 +71,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:

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日志
     }
 }

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) {

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
+	 * @param userId
-	 * @return
+	 * @return epmet:badge:user:[customerId]:[userId]
-	 * @author wxz
+	 * @Description 用户勋章缓存 epmet:badge:user:[customerId]:[userId]
-	 * @date 2021.01.20 16:56
+	 * @author wangc
+	 * @date 2020.11.05 13:34
 	 */
-	public static String getCustomerApiServiceKey(String customerId) {
+	public static String getResiUserBadgeKey(String customerId, String userId) {
-		return rootPrefix.concat("customer:thirdplat:apiservice:").concat(customerId);
+		return rootPrefix.concat("badge:user:").concat(customerId).concat(":").concat(StringUtils.isBlank(userId) ? "*" : userId);
 	}
 }

epmet-gateway/src/main/resources/bootstrap.yml

@@ -419,7 +419,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 hystrix:

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;
 }

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);
 }

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) {
+    public List<IssueInfoDTO> selectShiftProjectIssueList(String customerId, String gridId, Integer pageNo, Integer pageSize) {
-        return issueDao.selectShiftProjectIssueList(customerId,gridId);
+        if (pageNo != null && pageSize != null) {
+            PageHelper.startPage(pageNo, pageSize);
+        }else{
+            PageHelper.startPage(NumConstant.ONE, NumConstant.TWENTY);
+        }
+        return issueDao.selectShiftProjectIssueList(customerId, gridId);
     }
 
 }

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));

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:

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>

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>

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:

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));
     }
 
     /**

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:

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

@@ -395,23 +395,25 @@
         LEFT JOIN
         (
 
-        SELECT
+             SELECT
-
+            project.ID AS projectId,
-        project.ID AS projectId,
+            IFNULL(period.handled_date,NOW()) AS finishDate
-        IF(project.project_status = 'closed',period.handled_date,NOW()) AS finishDate
+        FROM
-
+            fact_origin_project_main_daily project
-        FROM fact_origin_project_main_daily project LEFT JOIN fact_origin_project_org_period_daily period
+            LEFT JOIN fact_origin_project_org_period_daily period ON project.ID = period.project_id
-        ON project.ID = period.project_id AND period.del_flag = '0' AND period.customer_id = #{customerId}
+            AND period.del_flag = '0'
-         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, 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>
 
 <!-- 查询当天新立的项目，是为了增量新增难点赌点的图片库 -->

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -31,7 +31,10 @@ 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.UserResiInfoResultDTO;
@@ -142,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;
 
@@ -1004,7 +1004,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 				dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 			} else {
-				logger.warn("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
+				logger.error("组长注册信息查询失败,msg:{},groupId:{}", groupLeaderUserInfo.getMsg(), dto.getGroupId());
 			}
 		});
 		return recommendGroupList;

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:

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

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;
     }
 }

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:

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:

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:

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:

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:

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:

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
 
 

epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml

@@ -55,7 +55,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true
 
 

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserRedisKeys.java

@@ -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 );}
-}

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.*;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBadgeRedis.java

@@ -1,13 +1,12 @@
 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;
-import com.epmet.constant.UserRedisKeys;
 import com.epmet.dao.BadgeDao;
 import com.epmet.dto.form.UserBadgeUnitFormDTO;
 import com.epmet.dto.result.UserBadgeInfoResultDTO;
@@ -110,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);
@@ -118,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;
@@ -142,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)){
@@ -158,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;
@@ -179,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);
             }
         }
 
@@ -207,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;
         }
 
@@ -220,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;
@@ -241,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 ->{
@@ -257,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());

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -19,10 +19,10 @@ 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;
-import com.epmet.constant.UserRedisKeys;
 import com.epmet.dao.GridLatestDao;
 import com.epmet.dao.RegisterRelationDao;
 import com.epmet.dao.UserBaseInfoDao;
@@ -80,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);
         //用户缓存的有效期为七天
@@ -90,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);
@@ -110,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);
@@ -201,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);
@@ -364,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));
             }
         });
     }

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -113,7 +113,7 @@ feign:
     config:
       default:
         loggerLevel: BASIC
-  httpclient:
+  okhttp:
     enabled: true