diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index fd02d32f73..35e82c3de2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/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) { diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java index 57e5717cda..4aebbce0d3 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java +++ b/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成员 */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 2249441579..5cc5c61612 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/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 redisTemplate; @Override public PageData page(Map params) { @@ -253,7 +250,6 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> 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 userInfo = epmetUserFeignClient.getUserResiInfoDTO(userParam); if(userInfo.success()){ 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 0e921c37b1..a4b6723afc 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 @@ -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 )