From e7d2e5b03322f777102d5135bd374eed5af112fd Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 Oct 2022 16:42:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../topic/controller/ResiTopicController.java    |  2 +-
 .../modules/topic/service/ResiTopicService.java  |  2 +-
 .../topic/service/impl/ResiTopicServiceImpl.java | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 1695aaba09..fb2ef52238 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
@@ -67,7 +67,7 @@ public class ResiTopicController {
     @PostMapping("gettopicdetail")
     public Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
         ValidatorUtils.validateEntity(topicDetailFormDTO);
-        return topicService.getTopicDetail(tokenDto,topicDetailFormDTO.getTopicId());
+        return topicService.getTopicDetail(topicDetailFormDTO.getTopicId());
     }
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
index c6e8ea45db..10600d85bf 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
@@ -170,7 +170,7 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @Author wangc
      * @Date 2020.04.01 15:56
      **/
-    Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(TokenDto tokenDto, String topicId);
+    Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(String topicId);
 
     /**
      * @return List<ResiTopicInfoResultDTO>
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 2c1e2f57cf..6590ff1a60 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
@@ -36,6 +36,8 @@ import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -892,7 +894,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @Date 2020.04.01 15:56
      **/
     @Override
-    public Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(TokenDto tokenDto, String topicId) {
+    public Result<ResiTopicIncludeIssueDetailResultDTO> getTopicDetail(String topicId) {
         //1.获取话题基本信息
         ResiTopicEntity topicDetail = baseDao.selectById(topicId);
         if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){
@@ -909,11 +911,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         resultDTO.setShiftIssueFlag(topicDetail.getShiftIssue());
         ResiGroupEntity resiGroupEntity=resiGroupDao.selectById(topicDetail.getGroupId());
         if(null!=resiGroupEntity){
-            CustomerGridFormDTO customerGridFormDTO=new CustomerGridFormDTO();
-            customerGridFormDTO.setGridId(resiGroupEntity.getGridId());
-            Result<CustomerGridDTO> gridInfoRes=govOrgOpenFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
-            if(gridInfoRes.success()&&null!=gridInfoRes.getData()){
-                resultDTO.setGridName(gridInfoRes.getData().getGridNamePath());
+            GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(resiGroupEntity.getGridId());
+            if(null!=gridInfoCache){
+                resultDTO.setGridName(gridInfoCache.getGridNamePath());
             }
         }
         //2.查询话题附件
@@ -1327,7 +1327,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
     @Override
     public Result<ResiTopicDetailResultDTO> getTopicDetailGov(String topicId) {
-        Result<ResiTopicIncludeIssueDetailResultDTO> result = getTopicDetail(null,topicId);
+        Result<ResiTopicIncludeIssueDetailResultDTO> result = getTopicDetail(topicId);
         if(result.success() && null != result.getData() && StringUtils.isNotBlank(result.getData().getTopicId())){
             return new  Result<ResiTopicDetailResultDTO>().ok(ConvertUtils.sourceToTarget(result.getData(),ResiTopicDetailResultDTO.class));
         }
@@ -1622,7 +1622,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         }
         //3.获取话题信息
         Result<ResiTopicIncludeIssueDetailResultDTO> topicDetailResult =
-            getTopicDetail(null,topicIdFormDTO.getTopicId());
+            getTopicDetail(topicIdFormDTO.getTopicId());
         if(topicDetailResult.success() && null != topicDetailResult.getData()){
             ResiTopicShiftIssueInitResultDTO result = ConvertUtils.sourceToTarget(topicDetailResult.getData(),ResiTopicShiftIssueInitResultDTO.class);
             try {