From d87931b8f4c06a8507996a24469c63da95f568a2 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 1 Sep 2020 14:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=A7=A6=E5=8F=91=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98=E8=A1=A8=E5=86=B3=E6=95=B0=E5=90=8C=E6=AD=A5=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=9C=A8=E5=85=B3=E9=97=AD=E8=AE=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=81=E8=AE=AE=E9=A2=98=E8=BD=AC=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=97=B6=E8=BF=9B=E8=A1=8C=E4=B8=80=E6=AC=A1=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IssueVoteStatisticalService.java  | 11 ++++
 .../epmet/service/impl/IssueServiceImpl.java  | 10 ++++
 .../impl/IssueVoteStatisticalServiceImpl.java | 56 +++++++++++++++----
 3 files changed, 67 insertions(+), 10 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 bdbf47bc78..c6334dd86e 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
@@ -148,4 +148,15 @@ public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatis
      * @date 2020.05.21 16:33
     **/
     IssueVoteStatisticalDTO getByIssueId(String issueId);
+
+    /**
+     * @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);
 }
\ No newline at end of file
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 94411a1b51..f5c690be74 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
@@ -437,6 +437,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
         //5:缓存中网格下表决中的议题总数减1
         govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId());
+        try {
+            issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null);
+        }catch (RenException e){
+            logger.error(e.getMsg());
+        }
     }
 
     /**
@@ -581,6 +586,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
 		//6:缓存中网格下表决中的议题总数减1
 		govIssueRedis.subtractWorkGrassrootsIssueRedDotValue(entity.getGridId());
+		try{
+		    issueVoteStatisticalService.syncVotingCacheToDbByParams(formDTO.getIssueId(),entity.getGridId(),null);
+        }catch(RenException e){
+		    logger.error(e.getMsg());
+        }
 	}
 
     /**
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 320138bfc5..60b0aabbc3 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
@@ -252,7 +252,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         //获取所有voting的议题
         Set<IssueDTO> issues =
                 issueDao.selectIssueIdsByCondition(issueParam);
-        if(null == issues || issues.size()< NumConstant.ONE){
+        if(null == issues || issues.isEmpty()){
             return;
         }
         Set<String> ids = issues.stream().map(IssueDTO::getId).collect(Collectors.toSet());
@@ -285,9 +285,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                 List<IssueVoteStatisticalDTO> listToUpdate = new ArrayList<>();
                 setVotableCountsAndUpdateCache(listToUpdate,
                         existedIds.stream().flatMap(existedId -> issues.stream().filter(issue ->
-                                StringUtils.equals(issue.getId(),existedId)).map(issueDTO -> {
-                                return issueDTO;
-                        })).collect(Collectors.toSet()),
+                                StringUtils.equals(issue.getId(),existedId))).collect(Collectors.toSet()),
                         votableCountMap);
 
                 // 批量更新listToUpdate
@@ -417,8 +415,10 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
     public void syncVotingCacheToDbByIssueId(String issueId) {
         VoteRedisFormDTO vote = issueVoteDetailRedis.getVoteStatistical(issueId);
         if(null == vote) throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueId));
-        IssueVoteStatisticalDTO toUpd = ConvertUtils.sourceToTarget(vote,IssueVoteStatisticalDTO.class);
-        toUpd.setUpdatedBy("system");
+        IssueVoteStatisticalDTO toUpd = new IssueVoteStatisticalDTO();
+        toUpd.setOppositionCount(vote.getOppositionAmount());
+        toUpd.setSupportCount(vote.getSupportAmount());
+        toUpd.setVotableCount(vote.getShouldVoteCount());
         IssueEntity issue = issueDao.selectById(issueId);
         if(null != issue && StringUtils.isNotBlank(issue.getGridId())){
             CommonGridIdFormDTO gridId = new CommonGridIdFormDTO();
@@ -427,17 +427,15 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
             resiGroupFeignClient.votableCount(gridId);
             if(votableCount.success() && null != votableCount.getData()){
                 toUpd.setVotableCount(votableCount.getData());
-
             }
-        }else {
-            toUpd.setVotableCount(NumConstant.ZERO);
         }
 
         IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueId);
         if(null != existedStatistical && StringUtils.isNotBlank(existedStatistical.getId())){
             toUpd.setId(existedStatistical.getId());
+            update(toUpd);
         }
-        update(toUpd);
+
     }
 
     /**
@@ -452,6 +450,44 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
         return baseDao.selectByIssueId(issueId);
     }
 
+    /**
+     * @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);
+        if(null == vote) throw new RenException(String.format(ModuleConstants.ISSUE_NOT_FOUND_EXCEPTION_TEMPLATE,issueId));
+        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()){
+                toUpd.setVotableCount(votableCount.getData());
+          }
+
+        if(StringUtils.isNotBlank(statisticalId)){
+            toUpd.setId(statisticalId);
+            update(toUpd);
+        }else{
+            IssueVoteStatisticalDTO existedStatistical = getByIssueId(issueId);
+            if(null != existedStatistical && StringUtils.isNotBlank(existedStatistical.getId())){
+                toUpd.setId(existedStatistical.getId());
+                update(toUpd);
+            }
+        }
+
+    }
+
     /**
      * @Description 遍历应表决数
      * @param list - List<IssueVoteStatisticalDTO> | Set<IssueDTO> | Map<String,Integer>