Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java

@@ -64,10 +64,15 @@ public class NoticeReadRecordDTO implements Serializable {
 	private String userId;
 
     /**
-     * read已读、un_read未读
+     * (通知过期前的阅读状态)read已读、un_read未读
      */
 	private String readFlag;
 
+    /**
+     * (通知过期后的阅读状态)已读:read未读:un_read;
+     */
+    private String viewDetail;
+
     /**
      * 删除标识
      */

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java

@@ -272,7 +272,7 @@ public interface ResiGroupDao extends BaseDao<ResiGroupEntity> {
 	 * @author zxc
 	 * @date 2021/4/21 上午9:45
 	 */
-	List<UserReadFlagResultDTO> selectUserReadFlag(@Param("groupId")String groupId,@Param("userId")String userId,@Param("ids")List<String> ids);
+	List<UserReadFlagResultDTO> selectUserReadFlag(@Param("userId")String userId,@Param("ids")List<String> ids);
 
 	/**
 	 * @Description  根据 活动或通知查询 未读人数

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java

@@ -64,8 +64,13 @@ public class NoticeReadRecordEntity extends BaseEpmetEntity {
 	private String userId;
 
     /**
-     * read已读、un_read未读
+     * (通知过期前的阅读状态)read已读、un_read未读
      */
 	private String readFlag;
 
+    /**
+     * (通知过期后的阅读状态)已读:read未读:un_read;
+     */
+	private String viewDetail;
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java

@@ -141,16 +141,18 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
     public void readType(ReadTypeFormDTO formDTO) {
         //1.查询通知详情,判断有没有过期
         NoticeEntity notice = noticeDao.selectById(formDTO.getNoticeId());
-        //已经过期的通知，新用户阅读不算阅读，在通知有效期内没有阅读的就不算已读
-        if(notice.getChangeTime().before(new Date())){
-            return;
+        //已经过期的通知，新用户阅读只修改过期后的阅读状态
+        boolean bl = true;
+        if (notice.getChangeTime().before(new Date())) {
+            //通知过期
+            bl = false;
         }
 
         //2.根据通知Id和当前用户查询是否存在通知阅读记录
         NoticeReadRecordEntity entity = baseDao.selectByNoticeId(formDTO.getNoticeId(), formDTO.getUserId());
 
-        //3.不存在记录时新增已读记录
-        if (null == entity || StringUtils.isEmpty(entity.getId())) {
+        //3.不存在记录且通知未过期时新增已读记录
+        if ((null == entity || StringUtils.isEmpty(entity.getId())) && bl) {
             //新增当前人员已读数据
             NoticeReadRecordEntity reafdRecord = new NoticeReadRecordEntity();
             reafdRecord.setCustomerId(notice.getCustomerId());
@@ -161,11 +163,20 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
             reafdRecord.setReadFlag(ReadFlagConstant.READ);
             insert(reafdRecord);
         } else {
-            //4.已存在记录且是已读状态不在修改
-            if (ReadFlagConstant.UN_READ.equals(entity.getReadFlag())) {
-                entity.setReadFlag(ReadFlagConstant.READ);
-                baseDao.updateById(entity);
+            //4.根据是否过期判断已存在记录且是已读状态不在修改
+            if (bl) {
+                if (ReadFlagConstant.UN_READ.equals(entity.getReadFlag())) {
+                    entity.setReadFlag(ReadFlagConstant.READ);
+                    entity.setViewDetail(ReadFlagConstant.READ);
+                    baseDao.updateById(entity);
+                }
+            } else {
+                if (ReadFlagConstant.UN_READ.equals(entity.getViewDetail())) {
+                    entity.setViewDetail(ReadFlagConstant.READ);
+                    baseDao.updateById(entity);
+                }
             }
+
         }
 
     }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java

@@ -237,8 +237,10 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
             reafdRecord.setUserId(m.getCustomerUserId());
             if ("leader".equals(m.getGroupLeaderFlag())) {
                 reafdRecord.setReadFlag(ReadFlagConstant.READ);
+                reafdRecord.setViewDetail(ReadFlagConstant.READ);
             }else {
                 reafdRecord.setReadFlag("un_read");
+                reafdRecord.setViewDetail("un_read");
             }
             reafdRecordList.add(reafdRecord);
         });
@@ -381,8 +383,10 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
             reafdRecord.setUserId(m.getCustomerUserId());
             if ("leader".equals(m.getGroupLeaderFlag())) {
                 reafdRecord.setReadFlag(ReadFlagConstant.READ);
+                reafdRecord.setViewDetail(ReadFlagConstant.READ);
             }else {
                 reafdRecord.setReadFlag("un_read");
+                reafdRecord.setViewDetail("un_read");
             }
             reafdRecordList.add(reafdRecord);
         });

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

@@ -2500,7 +2500,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         List<String> ids = latestTenData.stream().map(m -> m.getId()).collect(Collectors.toList());
         List<UserInfoResultDTO> userInfos = disPoseUserInfo(result.getGroupType(), userIds);
         // 查询用户的 活动或通知的 阅读状态
-        List<UserReadFlagResultDTO> userReadFlag = resiGroupDao.selectUserReadFlag(groupId, userId, ids);
+        List<UserReadFlagResultDTO> userReadFlag = resiGroupDao.selectUserReadFlag( userId, ids);
         // 查询小组下的 通知或活动 未读人数
         List<UserUnReadResultDTO> userUnReadCount = resiGroupDao.selectUserUnReadById(groupId, ids);
         latestTenData.forEach(l -> {
@@ -2520,7 +2520,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             // 用户已读，未读
             if (!CollectionUtils.isEmpty(userReadFlag)){
                 userReadFlag.forEach(u -> {
-                    if (l.getUserId().equals(u.getUserId()) && l.getId().equals(u.getId())){
+                    if (l.getId().equals(u.getId())){
                         l.setReadOrUnRead(u.getReadFlag());
                     }
                 });

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.20__alter_read.sql

@@ -0,0 +1,12 @@
+ALTER TABLE `act_read_record`
+MODIFY COLUMN `READ_FLAG`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'un_read' COMMENT '活动关闭前已读:read；未读:un_read' AFTER `GROUP_ACT_ID`,
+ADD COLUMN `VIEW_DETAIL`  varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '已读:read未读:un_read;' AFTER `READ_FLAG`;
+
+UPDATE act_read_record set VIEW_DETAIL = READ_FLAG;
+
+
+ALTER TABLE `notice_read_record`
+MODIFY COLUMN `READ_FLAG`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'unread' COMMENT '(通知过期前的阅读状态)read已读、un_read未读' AFTER `USER_ID`,
+ADD COLUMN `VIEW_DETAIL`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '(通知过期后的阅读状态)已读:read未读:un_read;' AFTER `READ_FLAG`;
+
+UPDATE notice_read_record set VIEW_DETAIL = READ_FLAG;

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

@@ -650,7 +650,6 @@
                    GROUP_ACT_ID = #{id}
                </foreach>
         )
-           AND GROUP_ID = #{groupId}
         )
         UNION ALL
         (SELECT
@@ -666,7 +665,6 @@
                    NOTICE_ID = #{id}
                </foreach>
         )
-           AND GROUP_ID = #{groupId}
         )
     </select>