From cc98e520b41c23710f32d759f357e8801431c162 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Thu, 9 Apr 2020 10:19:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?/resi/group/group/getgroupsummarize?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?totalTopics=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/group/result/GroupSummarizeResultDTO.java | 5 +++++ .../src/main/resources/mapper/group/ResiGroupDao.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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/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 ) From fbf1689c35db1821795d18e9aac1fc71bf08ecb1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 9 Apr 2020 10:45:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8F=91=E5=B8=83=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/redis/RedisUtils.java | 9 +++++++++ .../modules/topic/service/impl/ResiTopicServiceImpl.java | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) 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-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()){