From 80d0643d11315ad0863c348bfe49063617dbbfec Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 28 Apr 2021 15:04:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=84=E4=BF=A1=E6=81=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91-=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=8C=89=E7=BB=84=E7=B1=BB=E5=9E=8B=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E4=BA=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiGroupServiceImpl.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 1c6cc3f142..bf50316c61 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -62,6 +62,7 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao; import com.epmet.modules.member.redis.ResiGroupMemberRedis; import com.epmet.modules.member.service.GroupMemeberOperationService; import com.epmet.modules.member.service.ResiGroupMemberService; +import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.*; import com.epmet.resi.group.dto.UserRoleDTO; @@ -164,6 +165,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { @@ -993,7 +996,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl getGroupIdByGridId(String gridId) { - if(StringUtils.isBlank(gridId)) return null; + if(StringUtils.isBlank(gridId)) { + return null; + } return baseDao.getGroupIdByGridId(gridId); } @@ -1483,7 +1488,19 @@ public class ResiGroupServiceImpl extends BaseServiceImpl userIds = new ArrayList<>(); + userIds.add(edit.getCreatedBy()); + List userInfos = resiTopicService.disPoseUserInfo(entity.getGroupType(), userIds); + userInfos.forEach(u->{ + if(edit.getCreatedBy().equals(u.getUserId())){ + result.setGroupLeaderName(u.getReleaseUserName()); + } + }); + } else { + result.setGroupLeaderName(resiGroupRedis.getFullName(edit.getCreatedBy())); + } return result; } From 4d64c41cbecb6412fcc231c9254f0d7f0ea281ad Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 28 Apr 2021 15:37:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=B7=B2=E8=AF=BB?= =?UTF-8?q?=E6=9C=AA=E8=AF=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0VIEW=5FDETAIL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/act/ActReadRecordDTO.java | 7 ++- .../act/entity/ActReadRecordEntity.java | 7 ++- .../service/impl/GroupActInfoServiceImpl.java | 44 +++++++++++-------- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java index c9350d4716..5af02bbd7e 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java @@ -60,10 +60,15 @@ public class ActReadRecordDTO implements Serializable { private String groupActId; /** - * 已读: read未读：un_read；查看活动详情后修改此表，或者插入一条新的已读记录 + * 活动关闭前已读:read；未读:un_read */ private String readFlag; + /** + * 已读:read未读:un_read + */ + private String viewDetail; + /** * 用户id */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java index 4ffe1d4c5f..81cc38589c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java @@ -56,10 +56,15 @@ public class ActReadRecordEntity extends BaseEpmetEntity { private String groupActId; /** - * 已读: read未读：un_read；查看活动详情后修改此表，或者插入一条新的已读记录 + * 活动关闭前已读:read；未读:un_read */ private String readFlag; + /** + * 已读:read未读:un_read + */ + private String viewDetail; + /** * 用户id */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java index 899f73b5ad..2369c5de2c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java @@ -202,8 +202,10 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl NumConstant.ZERO ? false : true); - if (!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) { - //如果活动关闭，则不更新已读记录 - //非关闭状态下，返回详情，并且已读状态 - ActReadRecordEntity actReadRecordEntity = actReadRecordDao.selectUserRec(formDTO.getGroupActId(), formDTO.getUserId()); - if (null == actReadRecordEntity) { - if (!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) { - //插入已读记录，默认不属于应读人。 - ActReadRecordEntity insertEntity = new ActReadRecordEntity(); - insertEntity.setCustomerId(groupActInfoEntity.getCustomerId()); - insertEntity.setGroupActId(formDTO.getGroupActId()); - insertEntity.setReadFlag(GroupActConstant.READ); - insertEntity.setShouldBeRead(Constant.NO); - insertEntity.setUserId(formDTO.getUserId()); - insertEntity.setGridId(groupActInfoEntity.getGridId()); - insertEntity.setGroupId(groupActInfoEntity.getGroupId()); - actReadRecordDao.insert(insertEntity); - } - } else { + //如果活动关闭，则不更新已读记录 + //非关闭状态下，返回详情，并且已读状态 + ActReadRecordEntity actReadRecordEntity = actReadRecordDao.selectUserRec(formDTO.getGroupActId(), formDTO.getUserId()); + if (null != actReadRecordEntity) { + /*if (!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) { + //插入已读记录，默认不属于应读人。 + ActReadRecordEntity insertEntity = new ActReadRecordEntity(); + insertEntity.setCustomerId(groupActInfoEntity.getCustomerId()); + insertEntity.setGroupActId(formDTO.getGroupActId()); + insertEntity.setReadFlag(GroupActConstant.READ); + insertEntity.setShouldBeRead(Constant.NO); + insertEntity.setUserId(formDTO.getUserId()); + insertEntity.setGridId(groupActInfoEntity.getGridId()); + insertEntity.setGroupId(groupActInfoEntity.getGroupId()); + insertEntity.setViewDetail(GroupActConstant.READ); + actReadRecordDao.insert(insertEntity); + }*/ + // } else { + if(!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){ if (GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())) { //未读->已读 actReadRecordEntity.setReadFlag(GroupActConstant.READ); actReadRecordEntity.setUpdatedTime(new Date()); + actReadRecordEntity.setViewDetail(GroupActConstant.READ); actReadRecordDao.updateById(actReadRecordEntity); } + }else{ + actReadRecordEntity.setUpdatedTime(new Date()); + actReadRecordEntity.setViewDetail(GroupActConstant.READ); + actReadRecordDao.updateById(actReadRecordEntity); } } return resultDTO; From 4de03750be45b7917f6b9e489f3b2a58bd84ce91 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 28 Apr 2021 15:52:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notice/result/UnReadListResultDTO.java | 5 +++++ .../topic/result/AllMessagesResultDTO.java | 4 ++-- .../epmet/modules/group/dao/ResiGroupDao.java | 2 +- .../service/impl/ResiTopicServiceImpl.java | 6 +++--- .../resources/mapper/group/ResiGroupDao.xml | 20 +++++++------------ 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java index 714a59537c..b92a1879d1 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java @@ -55,6 +55,11 @@ public class UnReadListResultDTO implements Serializable { */ private Boolean isExpirat; + /** + * 是否编辑过(true：是，false：否) + */ + private Boolean isChanged; + @JsonIgnore private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/AllMessagesResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/AllMessagesResultDTO.java index 378b3ad861..fbb744420c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/AllMessagesResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/AllMessagesResultDTO.java @@ -24,12 +24,12 @@ public class AllMessagesResultDTO implements Serializable { /** * 发布者的全称（街道-姓氏先生/女士）【专项组显示真实名】 */ - private String userNickName; + private String releaseUserName; /** * 发布者的头像Url */ - private String userHeadPhoto; + private String releaseUserHeadPhoto; /** * 发布时间yyyy-MM-dd diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 44d94c04aa..0818935a1c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -271,7 +271,7 @@ public interface ResiGroupDao extends BaseDao { * @author zxc * @date 2021/4/21 上午9:45 */ - List selectUserReadFlag(@Param("groupId")String groupId,@Param("userIds")List userIds,@Param("ids")List ids); + List selectUserReadFlag(@Param("groupId")String groupId,@Param("userId")String userId,@Param("ids")List ids); /** * @Description 根据 活动或通知查询 未读人数 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 7f67bf5f83..79a5172bd5 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 @@ -2345,7 +2345,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl ids = latestTenData.stream().map(m -> m.getId()).collect(Collectors.toList()); List userInfos = disPoseUserInfo(result.getGroupType(), userIds); // 查询用户的 活动或通知的 阅读状态 - List userReadFlag = resiGroupDao.selectUserReadFlag(groupId, userIds, ids); + List userReadFlag = resiGroupDao.selectUserReadFlag(groupId, userId, ids); // 查询小组下的 通知或活动 未读人数 List userUnReadCount = resiGroupDao.selectUserUnReadById(groupId, ids); latestTenData.forEach(l -> { @@ -2526,8 +2526,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl { if (a.getUserId().equals(u.getUserId())){ - a.setUserNickName(u.getReleaseUserName()); - a.setUserHeadPhoto(u.getReleaseUserHeadPhoto()); + a.setReleaseUserName(u.getReleaseUserName()); + a.setReleaseUserHeadPhoto(u.getReleaseUserHeadPhoto()); } }); // 徽章 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 a010334abd..49c73e454b 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 @@ -643,11 +643,7 @@ FROM act_read_record WHERE DEL_FLAG = 0 - AND ( - - USER_ID = #{userId} - - ) + AND USER_ID = #{userId} AND ( GROUP_ACT_ID = #{id} @@ -663,11 +659,7 @@ FROM notice_read_record WHERE DEL_FLAG = 0 - AND ( - - USER_ID = #{userId} - - ) + AND USER_ID = #{userId} AND ( NOTICE_ID = #{id} @@ -735,7 +727,7 @@