缓存相关调整

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @Author yinzuomei
  * @Date 2020/3/16 14:48
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class,url="http://localhost:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
 public interface EpmetUserFeignClient {
 
 	/**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java

@@ -51,7 +51,12 @@ public class ResiGroupRedis {
         }
     }
 
-    public String get(String id){
+    public ResiGroupInfoRedisDTO get(String groupId){
+        if(StringUtils.isNotBlank(groupId)){
+            ResiGroupInfoRedisDTO groupCache = (ResiGroupInfoRedisDTO)
+            redisUtils.get(RedisKeys.getResiGroupInfoKey(groupId));
+            return groupCache;
+        }
         return null;
     }
 

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

@@ -560,16 +560,16 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				ConvertUtils.sourceToTarget(statisticalDTO,ResiGroupStatisticalInfoRedisDTO.class);
 		statisticalObjct.setTotalEarnestMembers(statisticalDTO.getTotalEarnestMemebers());
 		statisticalObjct.setTotalNormalMembers(statisticalDTO.getTotalNormalMemebers());
-		ResiGroupInfoRedisDTO sorceObject =
+		ResiGroupInfoRedisDTO targetObject =
 				ConvertUtils.sourceToTarget(groupDTO,ResiGroupInfoRedisDTO.class);
-		sorceObject.setGroupId(groupDTO.getId());
+		targetObject.setGroupId(groupDTO.getId());
-		sorceObject.setGroupState(groupDTO.getState());
+		targetObject.setGroupState(groupDTO.getState());
 		SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
 		if(null!=groupDTO.getLatestTopicPublishDate()){
-			sorceObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate()));
+			targetObject.setLatestTopicPublishDate(format.format(groupDTO.getLatestTopicPublishDate()));
 		}
-		sorceObject.setGroupStatisticalInfo(statisticalObjct);
+		targetObject.setGroupStatisticalInfo(statisticalObjct);
-		return sorceObject;
+		return targetObject;
 	}
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java

@@ -89,7 +89,7 @@ public class ResiGroupMemberRedis {
      **/
     public ResiGroupMemberInfoRedisResultDTO getKeys(String groupId){
         Set<String> groupMemberKeys =
-        redisUtils.keys(RedisKeys.getResiGroupInfoKey(groupId).concat("*"));
+        redisUtils.keys(RedisKeys.getResiGroupMemberInfoKey(groupId,"*"));
         Map<String,ResiGroupMemberInfoRedisDTO> memberMap = new HashMap<>(NumConstant.ONE_HUNDRED);
         for(String key : groupMemberKeys){
             ResiGroupMemberInfoRedisDTO member = (ResiGroupMemberInfoRedisDTO)redisUtils.get(key);

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

@@ -28,7 +28,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
-import com.epmet.dto.UserMessageDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
@@ -39,6 +38,7 @@ import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.exception.ModuleErrorCode;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.group.entity.ResiGroupEntity;
+import com.epmet.modules.group.redis.ResiGroupRedis;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.group.service.ResiGroupStatisticalService;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
@@ -104,6 +104,9 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	@Autowired
 	private ResiGroupMemberRedis resiGroupMemberRedis;
 
+	@Autowired
+	private ResiGroupRedis resiGroupRedis;
+
 	@Override
 	public PageData<ResiGroupMemberDTO> page(Map<String, Object> params) {
 		IPage<ResiGroupMemberEntity> page = baseDao.selectPage(
@@ -340,6 +343,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		resiGroupDTO.setCustomerId(resiGroupDTO.getCustomerId());
 		ResiGroupMemberInfoRedisDTO memberRedis = transferToMemberInfoRedis(resiGroupMemberDTO);
 		resiGroupMemberRedis.set(memberRedis);
+		//8、修改群组缓存信息
+
 		return new Result();
 	}
 

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

@@ -25,7 +25,6 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 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.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -43,7 +42,6 @@ import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.topic.dao.ResiTopicAttachmentDao;
-import com.epmet.modules.topic.dao.ResiTopicCommentDao;
 import com.epmet.modules.topic.dao.ResiTopicDao;
 import com.epmet.modules.topic.dao.ResiTopicOperationDao;
 import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity;
@@ -67,14 +65,12 @@ import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.bouncycastle.math.raw.Mod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
@@ -781,7 +777,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 topic.setReleaseUserHeadPhoto(user.getHeadPhoto());
                 topic.setReleaseUserName(user.getShowName());
 
-                //存进缓存
+                //存入缓存
                 ResiGroupMemberInfoRedisDTO memberRedisDTO = new ResiGroupMemberInfoRedisDTO();
                 ResiGroupMemberDTO memberMySql = resiGroupMemberDao.selectGroupMemberInfo(groupId, user.getUserId());
                 memberRedisDTO.setMemberStatus(memberMySql.getStatus());