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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/user/LoginUserUtil.java

@@ -34,6 +34,18 @@ public class LoginUserUtil {
         return userId;
     }
 
+    /**
+     * 查询登录用户的客户Id
+     * @return
+     */
+    public String getCurrentCustomerId() {
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+        if (request == null) {
+            return null;
+        }
+        return request.getHeader(AppClientConstant.CUSTOMER_ID);
+    }
+
     /**
      * 登录用户的App头信息
      * @return

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenDifficultyDataEntity.java

@@ -61,7 +61,7 @@ public class ScreenDifficultyDataEntity extends BaseEpmetEntity {
 	private String orgName;
 
     /**
-     * 事件原Id
+     * 事件原Id（项目Id）
      */
 	private String eventId;
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java

@@ -248,6 +248,7 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
     /**
      * @Description 查询难点赌点基础信息
      * @param customerId
+     * @param thresholdValue 项目超期阈值
 
      * @return java.util.List<com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity>
      * @author wangc
@@ -422,4 +423,4 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
 
 
 
-}
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -157,8 +157,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
         //图片
         List<ProjectSourceMapFormDTO> projectSourceMap = factOriginProjectMainDailyService.getNewProject(param.getCustomerId(),projectIds);
 
-        Map<String,List<ScreenDifficultyImgDataEntity>> imgMap =
+        Map<String,List<ScreenDifficultyImgDataEntity>> imgMap = topicService.getTopicImgs(projectSourceMap);
-                topicService.getTopicImgs(projectSourceMap);
 
         Map<String,String> contentMap = topicService.getTopicContent(projectSourceMap);
 
@@ -183,8 +182,9 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
             diff.setDataEndTime(DateUtils.getBeforeNDay(NumConstant.ONE));
         });
         List<ScreenDifficultyImgDataEntity> imgList = new LinkedList<>();
-        imgMap.values().forEach(list -> {imgList.addAll(list);});
+        imgMap.values().forEach(imgList::addAll);
 
+        //立案后会有 一个process 如果没有则说明是垃圾数据 如果有其他方式立项的项目则需要考虑下兼容
         difficulties.removeIf( diff -> StringUtils.isBlank(diff.getLatestOperateDesc()));
 
         screenDifficultyDataService.dataClean(param.getCustomerId(),difficulties,imgList);

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

@@ -337,17 +337,18 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	 * @Date 2020/3/30 15:07
 	 **/
 	private Result<UserResiInfoResultDTO> getGroupLeaderUserInfo(String groupId) {
+		String customerId = loginUserUtil.getCurrentCustomerId();
 		//群主名称需要调用feign查询
-		ResiGroupEntity resiGroupEntity = baseDao.selectById(groupId);
+//		ResiGroupEntity resiGroupEntity = baseDao.selectById(groupId);
-		if (null == resiGroupEntity) {
+//		if (null == resiGroupEntity) {
-			return new Result<>();
+//			return new Result<>();
-		}
+//		}
 		ResiGroupMemberDTO groupMemberDTO = baseDao.selectGroupLeader(groupId);
 		if (null == groupMemberDTO) {
 			return new Result<>();
 		}
 		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
-		resiUserInfoFormDTO.setCustomerId(resiGroupEntity.getCustomerId());
+		resiUserInfoFormDTO.setCustomerId(customerId);
 		resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
 		return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 	}

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

@@ -85,4 +85,16 @@ public interface UserConstant {
 	 * user_wechat表更新数据失败
 	 */
 	String UPDATE_USER_WECHAT = "更新用户微信信息失败";
+	/**
+	 * 先生
+	 */
+	String MAN = "先生";
+	/**
+	 * 女士
+	 */
+	String WOMAN = "女士";
+	/**
+	 * 先生/女士
+	 */
+	String MAN_WOMAN = "先生/女士";
 }

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

@@ -33,18 +33,6 @@ public class UserResiInfoRedis {
     @Autowired
     private RedisUtils redisUtils;
 
-    public void delete(Object[] ids) {
-
-    }
-
-    public void set(){
-
-    }
-
-    public String get(String id){
-        return null;
-    }
-
     public void setUserResiMobileCode(String userId, String mobile, String verificationCode){
         String key = RedisKeys.getResiRegisterMobileCodeKey(userId, mobile, verificationCode);
         //手机验证码放入缓存中 有效时间30分钟
@@ -61,4 +49,4 @@ public class UserResiInfoRedis {
         redisUtils.deleteByPattern(key);
     }
 
-}
+}

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

@@ -24,18 +24,15 @@ import com.epmet.common.token.util.UserUtil;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
+import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
-import com.epmet.commons.tools.enums.EventEnum;
 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.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserRoleConstant;
 import com.epmet.dao.UserCustomerDao;
 import com.epmet.dao.UserResiInfoDao;
@@ -46,6 +43,7 @@ import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.SendVerificationCodeResultDTO;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.entity.UserResiInfoEntity;
@@ -163,8 +161,33 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 **/
 	@Override
 	public Result<UserResiInfoResultDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
-		UserResiInfoResultDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO);
+		//先查缓存 否则查询数据库 这个方法里有
-		return new Result<UserResiInfoResultDTO>().ok(userResiInfoDTO);
+		UserBaseInfoResultDTO userBaseInfoResultDTO = userBaseInfoService.queryUserBaseInfoFromCache(userResiInfoFormDTO.getUserId());
+		if (userBaseInfoResultDTO != null){
+			UserResiInfoResultDTO resultDTO = new UserResiInfoResultDTO();
+			resultDTO.setUserId(userBaseInfoResultDTO.getUserId());
+			resultDTO.setRegMobile(userBaseInfoResultDTO.getMobile());
+			resultDTO.setSurname(userBaseInfoResultDTO.getSurname());
+			resultDTO.setName(userBaseInfoResultDTO.getName());
+			resultDTO.setStreet(userBaseInfoResultDTO.getStreet());
+			resultDTO.setDistrict(userBaseInfoResultDTO.getDistrict());
+			resultDTO.setBuildingAddress(userBaseInfoResultDTO.getBuildingAddress());
+			resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
+
+			String gender = null;
+			if (NumConstant.ONE_STR.equals(userBaseInfoResultDTO.getGender())) {
+				gender = UserConstant.MAN;
+			} else if (NumConstant.TWO_STR.equals(userBaseInfoResultDTO.getGender())) {
+				gender = UserConstant.WOMAN;
+			} else {
+				gender = UserConstant.MAN_WOMAN;
+			}
+			String leaderName = userBaseInfoResultDTO.getStreet().concat(StrConstant.HYPHEN).concat(userBaseInfoResultDTO.getSurname()).concat(gender);
+			resultDTO.setShowName(leaderName);
+			resultDTO.setHeadPhoto(userBaseInfoResultDTO.getHeadImgUrl());
+			return new Result<UserResiInfoResultDTO>().ok(resultDTO);
+		}
+		return new Result<UserResiInfoResultDTO>().ok(null);
 	}
 
 	/**