From 7484ca70cb4b50690864fac561628bd8ed1ee510 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 29 Apr 2021 15:38:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=BA=20if=EF=BC=8Celse=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=A7=E6=8B=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 60 ++++++++++++++-----
 1 file changed, 45 insertions(+), 15 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 fcf366c789..f5d4db2f50 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
@@ -482,10 +482,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                                 Collections.EMPTY_LIST :
                                                 badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO::getBadgeIcon).collect(Collectors.toList())
                                 );
-                            } else top.setBadgeList(Collections.EMPTY_LIST);
+                            } else {
+                                top.setBadgeList(Collections.EMPTY_LIST);
+                            }
                         });
 
-                    } else latestTenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    } else {
+                        latestTenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    }
 
                 }
             }
@@ -555,10 +559,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                             Collections.EMPTY_LIST :
                                             badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO :: getBadgeIcon).collect(Collectors.toList())
                             );
-                        }else top.setBadgeList(Collections.EMPTY_LIST);
+                        }else {
+                            top.setBadgeList(Collections.EMPTY_LIST);
+                        }
                     });
 
-                }else pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                }else {
+                    pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                }
 
             }
 
@@ -887,8 +895,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if(null == groupEntity || StringUtils.isBlank(groupEntity.getCustomerId())){
                 log.error("com.epmet.modules.topic.service.impl.ResiTopicServiceImpl.getTopicDetail，获取不到组信息，话题Id：{}小组Id：{}",topicId,topicDetail.getGroupId());
                 throw new RenException(ModuleConstant.NO_SUCH_GROUP);
-            }else customerId = groupEntity.getCustomerId();
-        }else customerId = groupCache.getCustomerId();
+            }else {
+                customerId = groupEntity.getCustomerId();
+            }
+        }else {
+            customerId = groupCache.getCustomerId();
+        }
 
         Result<Map<String, List<UserBadgeUnitFormDTO>>> badgeR
                 = userOpenFeignClient.userShowBadge(new UserGroupFormDTO(customerId, userId));
@@ -965,10 +977,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                                 Collections.EMPTY_LIST :
                                                 badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO::getBadgeIcon).collect(Collectors.toList())
                                 );
-                            } else top.setBadgeList(Collections.EMPTY_LIST);
+                            } else {
+                                top.setBadgeList(Collections.EMPTY_LIST);
+                            }
                         });
 
-                    } else hiddenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    } else {
+                        hiddenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    }
 
                 }
             }
@@ -1803,7 +1819,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);
             }
 
-        }else throw new RenException(dataFilterResult.getMsg());
+        }else {
+            throw new RenException(dataFilterResult.getMsg());
+        }
 
         return result;
 
@@ -1820,12 +1838,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     public IssueShiftedFromTopicFormDTO getIssueInfoWhenAudit(ResiTopicTurnIssueFromDTO param) {
 
         ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(param.getTopicId());
-        if (null == group) throw new RenException(ModuleConstant.QUERY_GROUPINFO_FAILED);
+        if (null == group) {
+            throw new RenException(ModuleConstant.QUERY_GROUPINFO_FAILED);
+        }
 
         ResiTopicEntity topic = resiTopicDao.selectById(param.getTopicId());
-        if (null == topic) throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
+        if (null == topic) {
+            throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
+        }
 
-        if (topic.getShiftIssue()) throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+        if (topic.getShiftIssue()) {
+            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+        }
 
         IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(param, IssueShiftedFromTopicFormDTO.class);
 
@@ -1871,7 +1895,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if (operationResult != NumConstant.ONE) {
                 logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
             }
-        } else logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+        } else {
+            logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+        }
         //7.更新组统计信息 议题数量+1
         resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
         if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {
@@ -2053,7 +2079,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                         Optional.ofNullable(param.getPageSize()).orElse(NumConstant.ONE)).doSelectPageInfo(() ->
                 baseDao.selectParticipatedTopics(param.getCustomerId(),param.getUserId()));
         List<ParticipatedTopicUnitResultDTO> result = page.getList();
-        if(CollectionUtils.isEmpty(result)) return Collections.EMPTY_LIST;
+        if(CollectionUtils.isEmpty(result)) {
+            return Collections.EMPTY_LIST;
+        }
         Result<List<OrgInfoResultDTO>> gridR = govOrgOpenFeignClient.selectOrgInfo(
                 new OrgInfoFormDTO(OrgInfoConstant.GRID,result.stream().map(ParticipatedTopicUnitResultDTO :: getTopicReleaseGridName).distinct().collect(Collectors.toList())));
         if(gridR.success() && !CollectionUtils.isEmpty(gridR.getData())){
@@ -2120,7 +2148,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 List<IssueApplicationDTO> applications = reply.getData();
 
                 return StringUtils.equals(ModuleConstant.TOPIC_SHIFTED_TO_ISSUE_STATUS_UNDER_AUDITING,applications.get(NumConstant.ZERO).getApplyStatus()) ? true : false;
-            }else return false;
+            }else {
+                return false;
+            }
         }
         log.error("Method [checkTopicIfUnderAuditing] of service gov-issue called failed,topicId is [%s]",topicId);
         throw new RenException(reply.getInternalMsg());

From 71b56c81d82e11bec05a48d38f9810b18c12320e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 29 Apr 2021 16:23:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?isChanged=E6=94=B9=E4=B8=BAtrue=20false?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/topic/result/LatestTenResultDTO.java     | 4 ++--
 .../src/main/resources/mapper/group/ResiGroupDao.xml        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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 7682cc71a9..1302bd15f9 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
@@ -91,9 +91,9 @@ public class LatestTenResultDTO implements Serializable {
     private Boolean isExpirat;
 
     /**
-     * 是否变更，yes，no
+     * 是否变更(true:是  false:否)
      */
-    private String isChange;
+    private Boolean isChanged;
 
     public LatestTenResultDTO() {
         this.id = "";
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 2d424313a8..d2a8d92efe 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
@@ -566,7 +566,7 @@
                   'topic' AS contentType,
                   IFNULL(ta.ATTACHMENT_URL,'') AS firstPhoto,
                   false AS isExpirat,
-                  'no' AS isChange
+                  false AS isChanged
              FROM resi_topic t
              LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = t.ID AND ta.ATTACHMENT_TYPE = 'image' AND ta.DEL_FLAG = '0' AND ta.SORT = 0
              WHERE t.DEL_FLAG = '0'
@@ -585,7 +585,7 @@
                  'act' AS contentType,
                  IFNULL(ac2.CONTENT,'') AS firstPhoto,
                  false AS isExpirat,
-                 'no' AS isChange
+                 false AS isChanged
              FROM group_act_info ai
              LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
              WHERE ai.DEL_FLAG = '0'
@@ -603,7 +603,7 @@
                   'notice' AS contentType,
                   IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto,
                   (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat,
-                  n.IS_CHANGE
+                  (case when n.is_change = 'yes' then true else false end) AS isChanged
              FROM notice n
              LEFT JOIN notice_attachment na ON na.NOTICE_ID = n.ID AND na.DEL_FLAG = '0' AND na.ATTACHMENT_TYPE = 'image' AND na.SORT = 0
              WHERE n.DEL_FLAG = '0'

From 1776b4d84b02e9340ed871c90bc1027c4bc17ef0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 29 Apr 2021 16:25:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?isChanged=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/topic/result/GetPastTopicListV2ResultDTO.java     | 2 +-
 .../src/main/resources/mapper/group/ResiGroupDao.xml      | 8 ++++----
 2 files changed, 5 insertions(+), 5 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 ef6ed42a4f..60ae030008 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
@@ -85,7 +85,7 @@ public class GetPastTopicListV2ResultDTO implements Serializable {
     /**
      * 是否变更，yes，no
      */
-    private String isChange = "no";
+    private Boolean isChanged = false;
 
     @JsonIgnore
     private String userId;
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 d2a8d92efe..8a4c374d44 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
@@ -770,7 +770,7 @@
 
     <!-- 根据IDs查询 topic，act，notice信息 -->
     <select id="getPastTopicListV2ByIds" resultType="com.epmet.resi.group.dto.topic.result.GetPastTopicListV2ResultDTO">
-        SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChange FROM
+        SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChanged FROM
             ((SELECT
                   t.ID,
                   t.CREATED_BY AS userId,
@@ -780,7 +780,7 @@
                   IFNULL(t.ISSUE_ID,'') AS issueId,
                   'topic' AS contentType,
                   false AS isExpirat,
-                  'no' AS isChange
+                  false AS isChanged
              FROM resi_topic t
              WHERE t.DEL_FLAG = '0'
                AND t.`STATUS` != 'hidden'
@@ -800,7 +800,7 @@
                  '' AS issueId,
                  'act' AS contentType,
                  false AS isExpirat,
-                 'no' AS isChange
+                 false AS isChanged
              FROM group_act_info ai
              WHERE ai.DEL_FLAG = '0'
              AND (
@@ -819,7 +819,7 @@
                   '' AS issueId,
                   'notice' AS contentType,
                   (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat,
-                  n.IS_CHANGE
+                  (case when n.is_change = 'yes' then true else false end) AS isChanged
              FROM notice n
              WHERE n.DEL_FLAG = '0'
              AND (

From b86634ea023a15d8ca1c44eaa36fb46f4c7fb0b7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 29 Apr 2021 16:40:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=9C=AA=E8=AF=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/topic/result/GetPastTopicListV2ResultDTO.java  |  5 +++++
 .../group/dto/topic/result/LatestTenResultDTO.java     |  2 +-
 .../topic/service/impl/ResiTopicServiceImpl.java       | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

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 60ae030008..982c254def 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
@@ -87,6 +87,11 @@ public class GetPastTopicListV2ResultDTO implements Serializable {
      */
     private Boolean isChanged = false;
 
+    /**
+     * 通知或活动未读人员数
+     */
+    private Integer unReadCount;
+
     @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 1302bd15f9..129c7a462d 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
@@ -111,6 +111,6 @@ public class LatestTenResultDTO implements Serializable {
         this.readOrUnRead = "";
         this.unReadCount = NumConstant.ZERO;
         this.isExpirat = false;
-        this.isChange = "no";
+        this.isChanged = false;
     }
 }
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 f5d4db2f50..ed8387e203 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
@@ -2438,6 +2438,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         List<UserInfoResultDTO> userInfos = this.disPoseUserInfo(resiGroup.getGroupType(), userIds);
         // 根据用户ID和【活动、通知ID】查询阅读状态
         List<ReadStatusResultDTO> readStatus = resiGroupDao.selectReadFlagByUserAndId(ids, userIds);
+        // 查询小组下的 通知或活动 未读人数
+        List<UserUnReadResultDTO> userUnReadCount = resiGroupDao.selectUserUnReadById(formDTO.getGroupId(), ids);
         // 查询用户徽章信息
         Result<List<UserBadgesResultDTO>> badgeResult = epmetUserOpenFeignClient.userBadges(new UserBadgesFormDTO(formDTO.getCustomerId(),userIds));
         if (!badgeResult.success()){
@@ -2479,6 +2481,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     }
                 });
             }
+            //
+            if (!CollectionUtils.isEmpty(userUnReadCount)){
+                userUnReadCount.forEach(u -> {
+                    if (i.getId().equals(u.getId())){
+                        i.setUnReadCount(u.getUnRead());
+                    }
+                });
+            }
         });
         return infos;
     }