From 70b2473890b05238069ba058d19af6aa7bb0f35a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 27 Apr 2021 15:30:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8C=89=E7=BB=84=E7=B1=BB=E5=9E=8B=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=BA=BA=E5=91=98=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiTopicServiceImpl.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) 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 e7a6e1ad55..2a3bb864d6 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 @@ -785,13 +785,25 @@ public class ResiTopicServiceImpl extends BaseServiceImpl userIds = new ArrayList<>(); + userIds.add(topicDetail.getCreatedBy()); + List userInfos = disPoseUserInfo(group.getGroupType(), userIds); + userInfos.forEach(u -> { + if (topicDetail.getCreatedBy().equals(u.getUserId())) { + resultDTO.setReleaseUserName(StringUtils.isBlank(u.getReleaseUserName()) ? "" : u.getReleaseUserName()); + resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(u.getReleaseUserHeadPhoto()) ? "" : u.getReleaseUserHeadPhoto()); + } + }); - //ResiGroupEntity group = resiGroupDao.selectById(topicDetail.getGroupId()); - ResiGroupMemberInfoRedisDTO memberRedis = - resiGroupMemberRedis.get(topicDetail.getGroupId(),topicDetail.getCreatedBy()); - if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ - resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); - resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto()); + } else { + ResiGroupMemberInfoRedisDTO memberRedis = + resiGroupMemberRedis.get(topicDetail.getGroupId(), topicDetail.getCreatedBy()); + if (null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())) { + resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); + resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto()); + } } //4.话题关闭详情 From 2f931a201490fce9674094229339a57695346b98 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 27 Apr 2021 15:31:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B0=8F=E7=BB=84=E8=BF=91=E5=8D=81?= =?UTF-8?q?=E6=9D=A1=20=E6=B7=BB=E5=8A=A0isChange?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/GetPastTopicListV2ResultDTO.java | 5 +++++ .../dto/topic/result/LatestTenResultDTO.java | 6 +++++ .../resources/mapper/group/ResiGroupDao.xml | 22 ++++++++++++------- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java index 842e720615..ef6ed42a4f 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java @@ -82,6 +82,11 @@ public class GetPastTopicListV2ResultDTO implements Serializable { */ private Boolean isExpirat; + /** + * 是否变更，yes，no + */ + private String isChange = "no"; + @JsonIgnore private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java index fd5637ba98..7682cc71a9 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java @@ -90,6 +90,11 @@ public class LatestTenResultDTO implements Serializable { */ private Boolean isExpirat; + /** + * 是否变更，yes，no + */ + private String isChange; + public LatestTenResultDTO() { this.id = ""; this.userId = ""; @@ -106,5 +111,6 @@ public class LatestTenResultDTO implements Serializable { this.readOrUnRead = ""; this.unReadCount = NumConstant.ZERO; this.isExpirat = false; + this.isChange = "no"; } } 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 67577bc380..1965071df5 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 @@ -552,7 +552,7 @@ - SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat FROM + SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChange FROM ((SELECT t.ID, t.CREATED_BY AS userId, @@ -781,7 +784,8 @@ t.`STATUS` AS status, IFNULL(t.ISSUE_ID,'') AS issueId, 'topic' AS contentType, - false AS isExpirat + false AS isExpirat, + 'no' AS isChange FROM resi_topic t WHERE t.DEL_FLAG = '0' AND t.`STATUS` != 'hidden' @@ -800,7 +804,8 @@ ai.`STATUS` AS status, '' AS issueId, 'act' AS contentType, - false AS isExpirat + false AS isExpirat, + 'no' AS isChange FROM group_act_info ai WHERE ai.DEL_FLAG = '0' AND ( @@ -818,7 +823,8 @@ '' AS status, '' AS issueId, 'notice' AS contentType, - (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat + (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat, + n.IS_CHANGE FROM notice n WHERE n.DEL_FLAG = '0' AND (