Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java

@@ -9,6 +9,7 @@
 package com.epmet.commons.tools.redis;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -62,6 +63,14 @@ public class RedisUtils {
      */
     public final static long NOT_EXPIRE = -1L;
 
+    public void selectDb(int index){
+        LettuceConnectionFactory jedisConnectionFactory = (LettuceConnectionFactory) redisTemplate.getConnectionFactory();
+        jedisConnectionFactory.setShareNativeConnection(false);
+        jedisConnectionFactory.setDatabase(index);
+        redisTemplate.setConnectionFactory(jedisConnectionFactory);
+        jedisConnectionFactory.resetConnection();
+    }
+
     public void set(String key, Object value, long expire) {
         redisTemplate.opsForValue().set(key, value);
         if (expire != NOT_EXPIRE) {

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java

@@ -54,6 +54,11 @@ public class GroupSummarizeResultDTO implements Serializable {
 	 */
 	private Integer totalApplyingMember;
 
+	/**
+	 * 话题总数
+	 */
+	private Integer totalTopics;
+
 	/**
 	 * 当前用户对应的群主标识leader,member成员
 	 */

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

@@ -57,7 +57,6 @@ import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -100,8 +99,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     @Autowired
     RedisUtils redisUtil;
 
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
 
     @Override
     public PageData<ResiTopicDTO> page(Map<String, Object> params) {
@@ -253,7 +250,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      **/
     @Override
     public Result<List<ResiTopicInfoResultDTO>> getLatestTopics(TokenDto tokenDto, String groupId) {
-
         if (null == tokenDto) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
@@ -463,7 +459,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         ResiTopicDTO topic = get(topicId);
         ResiGroupEntity group = resiGroupDao.selectById(topic.getGroupId());
         UserResiInfoFormDTO userParam = new UserResiInfoFormDTO();
-        userParam.setUserId(tokenDto.getUserId());
+        userParam.setUserId(topic.getCreatedBy());
         userParam.setCustomerId(group.getCustomerId());
         Result<UserResiInfoResultDTO> userInfo =  epmetUserFeignClient.getUserResiInfoDTO(userParam);
         if(userInfo.success()){

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -149,7 +149,8 @@
                     gmo.DEL_FLAG = '0'
                     AND gmo.GROUP_ID = rg.id
                     AND gmo.OPERATE_STATUS = 'under_auditting'
-            ) AS totalApplyingMember
+            ) AS totalApplyingMember,
+            rgs.TOTAL_TOPICS
         FROM
             resi_group rg
             LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )