From c31e7d7194d93a7f476cc0b9183fca51c8a6a081 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 2 Feb 2023 14:34:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E6=A5=BC=E9=99=A2=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/dto/topic/result/YtTopicDetailResultDTO.java |  1 +
 .../group/dto/topic/result/YtTopicInfoResultDTO.java   | 10 ++++++++++
 .../modules/topic/service/impl/YtTopicServiceImpl.java | 10 ++++++++++
 .../src/main/resources/mapper/topic/YtTopicDao.xml     |  1 +
 4 files changed, 22 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java
index 6b3aaed414..d5e4675af0 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicDetailResultDTO.java
@@ -82,4 +82,5 @@ public class YtTopicDetailResultDTO implements Serializable {
      * */
     private String oppositionCount;
     private String userName;
+    private String gridName;
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java
index b6f346b1f2..a1ede2ebc7 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/YtTopicInfoResultDTO.java
@@ -31,6 +31,16 @@ public class YtTopicInfoResultDTO implements Serializable {
     private String releaseUserName;
     private String userName;
 
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 网格名
+     */
+    private String gridName;
+
     /**
      * 发布人头像
      * */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java
index a2e4681dec..04576f0480 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/YtTopicServiceImpl.java
@@ -218,6 +218,12 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
         } else {
             result.setVoteStatus(TopicConstant.NONE);
         }
+
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(entity.getGridId());
+        if (null != gridInfo) {
+            result.setGridName(gridInfo.getGridNamePath());
+        }
+
         return result;
     }
 
@@ -257,6 +263,10 @@ public class YtTopicServiceImpl extends BaseServiceImpl<YtTopicDao, YtTopicEntit
                 } else {
                     item.setReleaseUserFlag("other");
                 }
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId());
+                if (null != gridInfo) {
+                    item.setGridName(gridInfo.getGridNamePath());
+                }
                 //获取附件图片
                 LambdaQueryWrapper<YtTopicAttachmentEntity> imgWrapper = new LambdaQueryWrapper<>();
                 imgWrapper.eq(YtTopicAttachmentEntity::getTopicId, item.getTopicId());
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml
index 46087bf06a..1d922ef955 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/YtTopicDao.xml
@@ -4,6 +4,7 @@
 <mapper namespace="com.epmet.modules.topic.dao.YtTopicDao">
     <select id="selectTopicList" resultType="com.epmet.resi.group.dto.topic.result.YtTopicInfoResultDTO">
         SELECT ID           AS topicId,
+               GRID_ID,
                TOPIC_CONTENT,
                STATUS,
                USER_NAME,