From c692768a8fc7d7d8439f257d676e8f9001f9cf8b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 9 Oct 2022 10:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E8=AE=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IssueVoteStatisticalService.java  |  5 +--
 .../epmet/service/impl/IssueServiceImpl.java  |  4 +-
 .../impl/IssueVoteStatisticalServiceImpl.java | 37 +++++++++++++------
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
index 165bbc2c38..d9f8c8c7dc 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
@@ -28,6 +28,7 @@ import com.epmet.dto.result.EvaluationListResultDTO;
 import com.epmet.dto.result.MyPartIssuesResultDTO;
 import com.epmet.dto.result.VoteResultDTO;
 import com.epmet.dto.result.VotingTrendResultDTO;
+import com.epmet.entity.IssueEntity;
 import com.epmet.entity.IssueVoteStatisticalEntity;
 
 import java.util.List;
@@ -153,14 +154,12 @@ public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatis
 
     /**
      * @Description 对指定的issueId的议题表决统计数缓存与Db同步
-     * @param issueId
-     * @param gridId
      * @parma statisticalId
      * @return
      * @author wangc
      * @date 2020.05.21 09:09
      **/
-    void syncVotingCacheToDbByParams(String issueId,String gridId,String statisticalId);
+    void syncVotingCacheToDbByParams(IssueEntity issueEntity, String statisticalId);
 
     /**
      * @Description  个人中心-我参与的议题列表
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 4aac38aee6..8fc490774f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -958,7 +958,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 		}
 
 		try{
-		    issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null);
+		    issueVoteStatisticalService.syncVotingCacheToDbByParams(entity,null);
         }catch(RenException e){
 		    logger.error(e.getInternalMsg());
         }
@@ -1088,7 +1088,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             //6:缓存中网格下表决中的议题总数减1
             govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId());
             try{
-                issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null);
+                issueVoteStatisticalService.syncVotingCacheToDbByParams(entity,null);
             }catch(RenException e){
                 logger.error(e.getInternalMsg());
             }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
index 05963e6baa..8312ee3c6d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
@@ -607,36 +607,49 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
 
     /**
      * @Description 对指定的issueId的议题表决统计数缓存与Db同步,对于前项操作已经查询过的数据不再重复查询
-     * @param issueId
-     * @param gridId
      * @parma statisticalId
      * @return
      * @author wangc
      * @date 2020.05.21 09:09
      **/
     @Override
-    public void syncVotingCacheToDbByParams(String issueId, String gridId, String statisticalId) {
-        VoteRedisFormDTO vote = issueVoteDetailRedis.getVoteStatistical(issueId);
+    public void syncVotingCacheToDbByParams(IssueEntity issueEntity, String statisticalId) {
+        VoteRedisFormDTO vote = issueVoteDetailRedis.getVoteStatistical(issueEntity.getId());
         if(null == vote) {
-            throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueId));
+            throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueEntity.getId()));
         }
         IssueVoteStatisticalDTO toUpd = new IssueVoteStatisticalDTO();
         toUpd.setOppositionCount(vote.getOppositionAmount());
         toUpd.setSupportCount(vote.getSupportAmount());
         toUpd.setVotableCount(vote.getShouldVoteCount());
-        CommonGridIdFormDTO gridParam = new CommonGridIdFormDTO();
-        gridParam.setGridId(gridId);
-        Result<Integer> votableCount =
-                resiGroupFeignClient.votableCount(gridParam);
-        if(votableCount.success() && null != votableCount.getData()){
+        if ("resi_topic".equals(issueEntity.getSourceType())) {
+            CommonGridIdFormDTO gridParam = new CommonGridIdFormDTO();
+            gridParam.setGridId(issueEntity.getGridId());
+            Result<Integer> votableCount =
+                    resiGroupFeignClient.votableCount(gridParam);
+            if (votableCount.success() && null != votableCount.getData()) {
                 toUpd.setVotableCount(votableCount.getData());
-          }
+            }else{
+                //先默认赋值0吧
+                toUpd.setVotableCount(NumConstant.ZERO);
+            }
+        } else {
+            AllResiByGridFormDTO allResiByGridFormDTO=new AllResiByGridFormDTO();
+            allResiByGridFormDTO.setGridId(issueEntity.getGridId());
+            Result<Integer> allResiByGrid=epmetUserOpenFeignClient.getAllResiByGrid(allResiByGridFormDTO);
+            if(allResiByGrid.success()){
+                toUpd.setVotableCount(allResiByGrid.getData());
+            }else{
+                //先默认赋值0吧
+                toUpd.setVotableCount(NumConstant.ZERO);
+            }
+        }
 
         if(StringUtils.isNotBlank(statisticalId)){
             toUpd.setId(statisticalId);
             update(toUpd);
         }else{
-            IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueId);
+            IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueEntity.getId());
             if(null != existedStatistical && StringUtils.isNotBlank(existedStatistical.getId())){
                 toUpd.setId(existedStatistical.getId());
                 update(toUpd);