From 6b13f7c1313578e63ed44509180b9e29c57c277f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 22 Apr 2021 23:36:29 +0800
Subject: [PATCH] back

---
 .../modules/act/controller/GroupActInfoController.java    | 7 +++++++
 .../modules/act/service/impl/GroupActInfoServiceImpl.java | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
index 8a91e31808..da742b975d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
@@ -88,6 +88,13 @@ public class GroupActInfoController {
      **/
     @PostMapping("readlist")
     public Result<NoticeReadListResultDTO> queryReadList(@RequestBody @LoginUser TokenDto tokenDto, @RequestBody ActReadViewFormDTO actReadViewFormDTO){
+        actReadViewFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(actReadViewFormDTO,ActReadViewFormDTO.AddUserInternalGroup.class);
+        return new Result<NoticeReadListResultDTO>().ok(groupActInfoService.queryReadList(actReadViewFormDTO));
+    }
+
+    @PostMapping("readlistV2")
+    public Result<NoticeReadListResultDTO> queryReadListV2(@RequestBody @LoginUser TokenDto tokenDto, @RequestBody ActReadViewFormDTO actReadViewFormDTO){
         actReadViewFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(actReadViewFormDTO,ActReadViewFormDTO.AddUserInternalGroup.class);
         return new Result<NoticeReadListResultDTO>().ok(groupActInfoService.queryReadListV2(actReadViewFormDTO));
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 072f75637e..1312d7642b 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
@@ -212,9 +212,9 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                 redisUtils.setBit(actShoudReadUserKey,memberDTO.getTempNum(),true);
             }
         });
-        /*readRecordEntityList.forEach(readRecordEntity->{
+        readRecordEntityList.forEach(readRecordEntity->{
             actReadRecordDao.insert(readRecordEntity);
-        });*/
+        });
     }
 
     private void saveGroupMessage(GroupActInfoEntity groupActInfoEntity) {
@@ -518,7 +518,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             insertEntity.setGridId(groupActInfoEntity.getGridId());
             insertEntity.setGroupId(groupActInfoEntity.getGroupId());
             // todo
-            // actReadRecordDao.insert(insertEntity);
+            actReadRecordDao.insert(insertEntity);
 
         }else{
             if(GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())){
@@ -526,7 +526,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                 actReadRecordEntity.setReadFlag(GroupActConstant.READ);
                 actReadRecordEntity.setUpdatedTime(new Date());
                 // todo
-                // actReadRecordDao.updateById(actReadRecordEntity);
+                actReadRecordDao.updateById(actReadRecordEntity);
 
                 //状态改为已读
                 redisUtils.setBit(actReadKey,resiGroupMemberDTO.getTempNum(),true);