From ec24d28f61026ad3de1522db6c4c23e0973e87b6 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 10 Dec 2021 17:59:36 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/modules/topic/controller/ResiTopicController.java | 2 ++
 1 file changed, 2 insertions(+)

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 c19e33d5ae..9353e6549f 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
@@ -3,6 +3,7 @@ package com.epmet.modules.topic.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -255,6 +256,7 @@ public class ResiTopicController {
      * @author wangc
      * @date 2020.05.13 19:08
      **/
+    @NoRepeatSubmit
     @PostMapping("turnintoissuev2")
     public Result<FirstTopicShiftedToIssueApplicationResultDTO> turnIntoIssueV2(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO){
         topicTurnIssueFromDTO.setUserId(tokenDto.getUserId());

From c6e7cc64774780be5c6bf0ae741d812cff1be2b3 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 11 Dec 2021 13:29:28 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=BB=9F=E8=AE=A1bug-?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=92=8C=E7=BB=84=E7=BB=87=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E7=BA=AC=E5=BA=A6=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E9=83=BD=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/issue/StatsIssueDao.java    | 11 ------
 .../com/epmet/service/Issue/IssueService.java | 34 -------------------
 .../service/Issue/impl/IssueServiceImpl.java  | 34 -------------------
 .../resources/mapper/issue/StatsIssueDao.xml  |  4 +--
 4 files changed, 2 insertions(+), 81 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java
index ac3043d843..1d00fbfdaa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java
@@ -3,7 +3,6 @@ package com.epmet.dao.issue;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.result.IssueInfoResultDTO;
 import com.epmet.dto.extract.result.IssueProcessInfoResultDTO;
-import com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO;
 import com.epmet.dto.extract.result.SatisfactionInfoResultDTO;
 import com.epmet.dto.issue.*;
 import com.epmet.entity.issue.IssueEntity;
@@ -173,16 +172,6 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
      */
     List<SatisfactionInfoResultDTO> selectIssueVoteInfo(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
-    /**
-     * desc: 根据客户id 获取当前议题的情况
-     *
-     * @param customerId
-     * @param dateId
-     * @return java.util.List<com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO>
-     * @author LiuJanJun
-     * @date 2020/9/27 1:22 下午
-     */
-    List<IssueVoteStatisticalResultDTO> selectIssueVoteStatis(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
     List<IssueProjectCategoryDictDTO> selectCategory(@Param("customerId") String customerId, @Param("ids") Set<String> set);
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java
index 445894bd66..9c02795140 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/IssueService.java
@@ -2,7 +2,6 @@ package com.epmet.service.Issue;
 
 import com.epmet.dto.extract.result.IssueInfoResultDTO;
 import com.epmet.dto.extract.result.IssueProcessInfoResultDTO;
-import com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO;
 import com.epmet.dto.extract.result.SatisfactionInfoResultDTO;
 import com.epmet.dto.issue.IssueAgencyDTO;
 import com.epmet.dto.issue.IssueDTO;
@@ -163,18 +162,6 @@ public interface IssueService {
      */
     List<SatisfactionInfoResultDTO> selectIssueVoteInfo(String customerId, String dateId);
 
-    /**
-     * desc: 【月】查询议题支持反对及应表决人数
-     * 数据由两部分组成 1：本月内已经关闭的话题的支持和反对数据 来自issue，issue_vote_statistical
-     *
-     * @param customerId
-     * @param monthId
-     * @return java.util.List<com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO>
-     * @author LiuJanJun
-     * @date 2020/9/27 11:20 上午
-     */
-    List<IssueVoteStatisticalResultDTO> selectIssueVoteStatis(String customerId, String monthId);
-
     /**
      * @Description 查找项目的分类名称 以-相连，以,分隔，
      * @param param
@@ -184,27 +171,6 @@ public interface IssueService {
     */
     Map<String,List<String>> getIntegratedProjectCategory(Map<String, Set<String>> param,String customerId);
 
-    /**
-     * 获取议题总数
-     * @author zhaoqifeng
-     * @date 2021/7/20 16:20
-     * @param customerId
-     * @param date
-     * @return java.util.List<com.epmet.dto.issue.IssueDTO>
-     */
-	List<IssueDTO> getIssueTotalList(String customerId, String date);
-
-
-	/**
-	 * 获取议题增量
-	 * @author zhaoqifeng
-	 * @date 2021/7/20 16:20
-	 * @param customerId
-	 * @param date
-	 * @return java.util.List<com.epmet.dto.issue.IssueDTO>
-	 */
-	List<IssueDTO> getIssueIncrList(String customerId, String date);
-
 	/**
 	 * @Author sun
 	 * @Description 查询议题库已删除网格下可能存在的项目Id集合
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java
index b86b6daa40..3122b0a1d2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java
@@ -7,7 +7,6 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.issue.StatsIssueDao;
 import com.epmet.dto.extract.result.IssueInfoResultDTO;
 import com.epmet.dto.extract.result.IssueProcessInfoResultDTO;
-import com.epmet.dto.extract.result.IssueVoteStatisticalResultDTO;
 import com.epmet.dto.extract.result.SatisfactionInfoResultDTO;
 import com.epmet.dto.issue.*;
 import com.epmet.entity.issue.IssueEntity;
@@ -141,11 +140,6 @@ public class IssueServiceImpl implements IssueService {
         return statsIssueDao.selectIssueVoteInfo(customerId, dateId);
     }
 
-    @Override
-    public List<IssueVoteStatisticalResultDTO> selectIssueVoteStatis(String customerId, String dateId) {
-        return statsIssueDao.selectIssueVoteStatis(customerId, dateId);
-    }
-
 	/**
 	 * @Description 查找项目的分类名称 以-相连，以,分隔，
 	 * @param param
@@ -177,34 +171,6 @@ public class IssueServiceImpl implements IssueService {
 		return map;
 	}
 
-	/**
-	 * 获取议题总数
-	 *
-	 * @param customerId
-	 * @param date
-	 * @return java.util.List<com.epmet.dto.issue.IssueDTO>
-	 * @author zhaoqifeng
-	 * @date 2021/7/20 16:20
-	 */
-	@Override
-	public List<IssueDTO> getIssueTotalList(String customerId, String date) {
-		return null;
-	}
-
-	/**
-	 * 获取议题增量
-	 *
-	 * @param customerId
-	 * @param date
-	 * @return java.util.List<com.epmet.dto.issue.IssueDTO>
-	 * @author zhaoqifeng
-	 * @date 2021/7/20 16:20
-	 */
-	@Override
-	public List<IssueDTO> getIssueIncrList(String customerId, String date) {
-		return null;
-	}
-
 	/**
 	 * @Author sun
 	 * @Description 查询议题库已删除网格下可能存在的项目Id集合
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
index 514f743353..4c7152c4c7 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
@@ -332,7 +332,7 @@
         WHERE
             DEL_FLAG = '0'
           AND CUSTOMER_ID = #{customerId}
-          AND DATE(UPDATED_TIME) <![CDATA[ <= ]]> #{date}
+          AND DATE(CREATED_TIME) <![CDATA[ <= ]]> #{date}
         GROUP BY
             ORG_ID, ISSUE_STATUS
     </select>
@@ -349,4 +349,4 @@
         </foreach>
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

From c6f0449593db0d1569c0983d53ad73472ced4d01 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 11 Dec 2021 13:46:44 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=BB=9F=E8=AE=A1bug-?=
 =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=92=8C=E7=BB=84=E7=BB=87=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E7=BA=AC=E5=BA=A6=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E9=83=BD=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9D=A5=20=E5=88=9A=E6=89=8D=E6=94=B9=E4=BA=86=E4=B8=AA?=
 =?UTF-8?q?=E5=AF=82=E5=AF=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/issue/StatsIssueDao.java  |  4 ----
 .../service/impl/StatsIssueServiceImpl.java      |  8 ++++----
 .../resources/mapper/issue/StatsIssueDao.xml     | 16 +---------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java
index 1d00fbfdaa..b57cbc0320 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/issue/StatsIssueDao.java
@@ -172,12 +172,8 @@ public interface StatsIssueDao extends BaseDao<IssueEntity> {
      */
     List<SatisfactionInfoResultDTO> selectIssueVoteInfo(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
-
     List<IssueProjectCategoryDictDTO> selectCategory(@Param("customerId") String customerId, @Param("ids") Set<String> set);
 
-
-	List<IssueDTO> getIssueTotalList(@Param("customerId") String customerId, @Param("date") String date);
-
 	/**
 	 * @Author sun
 	 * @Description 查询议题库已删除网格下可能存在的项目Id集合
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
index 4c587f9694..47d5045c01 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java
@@ -103,14 +103,14 @@ public class StatsIssueServiceImpl implements StatsIssueService {
 	 */
 	private void customerStats(String customerId, Date date) {
 		Date lastDate = DateUtils.getLastDayOfMonth(date);
-		//机关议题日统计
-		saveIssueAgencyDaily(customerId, date);
-		//机关议题月统计
-		saveIssueAgencyMonthly(customerId, lastDate);
 		//网格议题日统计
 		saveIssueGridDaily(customerId, date);
 		//网格议题月统计
 		saveIssueGridMonthly(customerId, lastDate);
+		//机关议题日统计
+		saveIssueAgencyDaily(customerId, date);
+		//机关议题月统计
+		saveIssueAgencyMonthly(customerId, lastDate);
 	}
 
 	@Override
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
index 4c7152c4c7..bedcb3e353 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml
@@ -12,7 +12,7 @@
         WHERE
             DEL_FLAG = '0'
         AND CUSTOMER_ID = #{customerId}
-        AND DATE(UPDATED_TIME) <![CDATA[ <= ]]> #{date}
+        AND DATE(CREATED_TIME) <![CDATA[ <= ]]> #{date}
         <if test="gridList != null and gridList.size() > 0">
         <foreach collection="gridList" item="gridId" index="index">
             AND GRID_ID != #{gridId}
@@ -322,20 +322,6 @@
         </foreach>
         order by a.category_type,a.sort
     </select>
-    <select id="getIssueTotalList" resultType="com.epmet.dto.issue.IssueDTO">
-        SELECT ORG_ID AS "agencyId",
-               ORG_ID_PATH AS "pIds",
-               ISSUE_STATUS AS "status",
-               COUNT(ID) AS "count"
-        FROM
-            issue
-        WHERE
-            DEL_FLAG = '0'
-          AND CUSTOMER_ID = #{customerId}
-          AND DATE(CREATED_TIME) <![CDATA[ <= ]]> #{date}
-        GROUP BY
-            ORG_ID, ISSUE_STATUS
-    </select>
 
     <select id="selectProjectByGrids" resultType="java.lang.String">
         SELECT DISTINCT

From 7ac69991af63d5859078da88c80ff5a65a9be36e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 11 Dec 2021 14:07:41 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=94=B9=E9=9B=86?=
 =?UTF-8?q?=E6=88=90=E5=B9=B3=E5=8F=B0=E7=9A=84=E4=B8=9C=E8=A5=BF=20?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=E8=A1=A8=E5=90=8D=20fact=5Ftopic=5Fissue=5Fg?=
 =?UTF-8?q?rid=5Fdaily=20=E5=88=B0=E6=97=B6=E5=80=99=E7=9C=8B=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/datastats/DatsStatsDao.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 3332f525f3..c625e19c9b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -221,7 +221,7 @@
         agency_id AS agencyId,
         issue_total AS shiftedIssueTotal
         FROM
-        fact_issue_agency_daily
+            fact_topic_issue_agency_daily
         WHERE
         del_flag = '0'
         AND date_id = #{dateId}
@@ -266,7 +266,7 @@
         grid_id AS gridId,
         issue_total AS shiftedIssueTotal
         FROM
-        fact_issue_grid_daily
+        fact_topic_issue_grid_daily
         WHERE
         del_flag = '0'
         AND date_id = #{dateId}

From 1bc26450be9e746b3ac77a39ef36e967c61e5580 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 13 Dec 2021 10:51:17 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E6=80=BB=E6=95=B0=E6=8A=BD=E5=8F=96=E9=80=BB=E8=BE=91bug?=
 =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BB=B4=E5=BA=A6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=89=8D=E4=B8=80=E5=A4=A9=EF=BC=9B=E5=8E=9F=E6=9D=A5=E6=98=AF?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A9=BA=E6=88=AA=E6=AD=A2=E5=88=B0=E4=BA=86?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=BA=86=20=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E6=AF=94?=
 =?UTF-8?q?=E6=83=B3=E8=A6=81=E7=9A=84=E8=A6=81=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/topic/impl/TopicServiceImpl.java      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
index a47baa85bd..4aa8d924a6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.topic.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.topic.TopicDao;
 import com.epmet.dto.AgencySubTreeDto;
@@ -75,8 +76,12 @@ public class TopicServiceImpl implements TopicService {
         agencies.forEach(agency -> {
             initAgencyGridMap(agency.getAgencyId(),agency,subGridOfAgency);
         });
-        //计算网格-组-话题映射关系
-        List<ResiGroupTopicResultDTO> topics = topicDao.selectGroupOrderByGrid(targetDate,customerId);
+        //计算网格-组-话题映射关系 如果时间为空则 默认取维度里的时间（也是默认t-1天）
+        Date breforeDate = targetDate;
+        if (targetDate == null){
+            breforeDate = DateUtils.parse(timeDimension.getDateId(),DateUtils.DATE_PATTERN_YYYYMMDD);
+        }
+        List<ResiGroupTopicResultDTO> topics = topicDao.selectGroupOrderByGrid(breforeDate,customerId);
         topics.forEach(groupTopic -> {
             if(null != groupTopic.getTopics() && groupTopic.getTopics().size() == NumConstant.ONE && StringUtils.isBlank(groupTopic.getTopics().get(NumConstant.ZERO).getTopicId())){
                 groupTopic.setTopics(new ArrayList<>());
@@ -287,7 +292,8 @@ public class TopicServiceImpl implements TopicService {
      * @author wangc
      * @date 2020.06.22 13:13
     **/
-    TopicStatisticalData calculateAndSummarizeTopicStatisticalData(Map<String, Set<String>> subGridOfAgency, List<AgencySubTreeDto> agencies, Map<String,List<ResiGroupTopicResultDTO>> gridGroupMap, Date targetDate,List<DimTopicStatusDTO> statusDimension ,DimIdGenerator.DimIdBean timeDimension ,String customerId){
+    TopicStatisticalData calculateAndSummarizeTopicStatisticalData(Map<String, Set<String>> subGridOfAgency, List<AgencySubTreeDto> agencies, Map<String,List<ResiGroupTopicResultDTO>> gridGroupMap,
+                                                                   Date targetDate,List<DimTopicStatusDTO> statusDimension ,DimIdGenerator.DimIdBean timeDimension ,String customerId){
         if(null == subGridOfAgency || subGridOfAgency.size() <= NumConstant.ZERO){
             return null;
         }
@@ -306,8 +312,7 @@ public class TopicServiceImpl implements TopicService {
         //参数:gridGroupMap 所有网格的组以及组内话题
 
         //[所有]话题当日的操作记录
-        List<ResiTopicOperationResultDTO> operations =
-            topicDao.selectTopicOperationRecord(targetDate);
+        List<ResiTopicOperationResultDTO> operations = topicDao.selectTopicOperationRecord(targetDate);
         //key:话题Id    value:这个话题在当日的操作记录
         //操作类型有: ①discussing(发布) ②hidden(屏蔽) ③hidden_cancelled(取消屏蔽) ④closed(关闭) ⑤shift_issue(转议题)
         //注意不要把【发布】和【取消屏蔽】混淆！！！

From 4b81f167df339ee67b6e4bf78d0880b787040f23 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 13 Dec 2021 13:53:27 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E6=80=BB=E6=95=B0=E6=8A=BD=E5=8F=96=E9=80=BB=E8=BE=91bug?=
 =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BB=B4=E5=BA=A6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=89=8D=E4=B8=80=E5=A4=A9=EF=BC=9B=E5=8E=9F=E6=9D=A5=E6=98=AF?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A9=BA=E6=88=AA=E6=AD=A2=E5=88=B0=E4=BA=86?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=BA=86=20=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E6=AF=94?=
 =?UTF-8?q?=E6=83=B3=E8=A6=81=E7=9A=84=E8=A6=81=E5=A4=9A=20->ression:?=
 =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98=E6=97=B6=E9=97=B4=20=E4=BB=8Elog?=
 =?UTF-8?q?=E9=87=8C=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/topic/TopicDao.xml  | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
index ae18ea2b7c..09754ca373 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -35,25 +35,14 @@
 
     topic.ID AS topicID,
     topic.STATUS,
-    topic.SHIFT_ISSUE,
-    <choose>
-        <when test="null != targetDate">
-            (CASE WHEN
-
-            topic.CREATED_TIME <![CDATA[>=]]> #{targetDate} AND topic.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{targetDate}, INTERVAL - 1 DAY)
-            THEN '1'
-            ELSE '0' END ) AS incrFlag
-
-        </when>
-        <otherwise>
-            (CASE WHEN
-            topic.CREATED_TIME <![CDATA[<]]>  CURDATE( ) AND topic.CREATED_TIME <![CDATA[>=]]> DATE_SUB( CURDATE( ), INTERVAL 1 DAY )
-            THEN '1'
-            ELSE '0' END ) AS incrFlag
-        </otherwise>
-    </choose>
-
-    FROM RESI_GROUP groupp LEFT JOIN RESI_TOPIC topic ON groupp.ID = topic.GROUP_ID AND topic.DEL_FLAG = '0'
+    CASE WHEN log.CREATED_TIME IS NULL THEN 0 ELSE 1 END AS 'SHIFT_ISSUE',
+    (CASE WHEN
+        topic.CREATED_TIME <![CDATA[>=]]> #{targetDate} AND topic.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{targetDate}, INTERVAL - 1 DAY)
+            THEN '1' ELSE '0' END ) AS incrFlag
+    FROM
+        RESI_GROUP groupp
+        LEFT JOIN RESI_TOPIC topic ON groupp.ID = topic.GROUP_ID AND topic.DEL_FLAG = '0'
+        LEFT JOIN resi_topic_operation log ON log.TOPIC_ID = topic.ID AND log.DEL_FLAG = '0' AND log.OPERATION_TYPE = 'shift_issue' AND log.CREATED_TIME <![CDATA[<]]> DATE_SUB( #{targetDate}, INTERVAL - 1 DAY )
     WHERE groupp.DEL_FLAG = '0'
     <if test='null != customerId and "" != customerId'>
         AND groupp.CUSTOMER_ID = #{customerId}

From c116f453c19fee228970b8577dac7c66a8af0c84 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 13 Dec 2021 16:08:55 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/FactAggregationExtractController.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java
index c0618c9250..9d833335c5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java
@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -93,6 +94,7 @@ public class FactAggregationExtractController {
     private void extractTopicDataDaily(StatsFormDTO formDTO) {
         try {
             statsTopicService.partition(formDTO);
+            log.info("extractTopicDataDaily end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【话题】数据失败", e);
         }

From fd417f7101dbc242804f45a9e75f8c8ffa06f297 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 14 Dec 2021 12:59:00 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8A=BD=E5=8F=96?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=20?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E9=83=A8=E5=88=86=E6=8A=BD=E5=8F=96=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/enums/BizTypeEnum.java      |  22 +++-
 .../form/AggregationExtractFormDTO.java       |   7 ++
 .../FactAggregationExtractController.java     | 102 +++++++++++++++---
 .../service/impl/StatsProjectServiceImpl.java |  35 +-----
 .../impl/StatsPublicityServiceImpl.java       |   2 +-
 .../main/resources/mapper/topic/TopicDao.xml  |   5 +-
 .../BizPointUserTotalDetailServiceImpl.java   |   5 -
 7 files changed, 118 insertions(+), 60 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java
index 1dec273299..8edc31e7e2 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/BizTypeEnum.java
@@ -11,10 +11,24 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum BizTypeEnum {
-	//枚举类型
+	//枚举类型 user,group,topic,issue,project,article
+	USER("user", "用户"),
 	GROUP("group", "小组"),
-	ACTIVITY("activity", "活动"),
-	AGENCY("agency", "组织");
+	TOPIC("topic", "话题"),
+	ISSUE("issue", "议题"),
+	PROJECT("project", "项目"),
+	ARTICLE("article", "文章（党建声音）"),
+	;
+
+	public static BizTypeEnum getEnum(String code) {
+		BizTypeEnum[] values = BizTypeEnum.values();
+		for (BizTypeEnum value : values) {
+			if (value.getType().equals(code)) {
+				return value;
+			}
+		}
+		return null;
+	}
 
 	/**
 	 * 类型
@@ -23,6 +37,6 @@ public enum BizTypeEnum {
 	/**
 	 * 描述
 	 */
-	private String typeDesc;
+	private String desc;
 
 }
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/AggregationExtractFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/AggregationExtractFormDTO.java
index e307587313..1dd051f139 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/AggregationExtractFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/AggregationExtractFormDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.extract.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Set;
 
 /**
  * desc: 从业务数据抽取到统计库Form DTO
@@ -30,4 +31,10 @@ public class AggregationExtractFormDTO implements Serializable {
      * 抽取类型 monthly，daily
      */
     private String type;
+
+    /**
+     * 要抽取的具体业务类型 不传默认所有
+     * @see com.epmet.commons.tools.enums.BizTypeEnum
+     */
+    private Set<String> bizType;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java
index 9d833335c5..c05e3d4b7b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactAggregationExtractController.java
@@ -1,7 +1,12 @@
 package com.epmet.controller;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
@@ -15,8 +20,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
 import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author liujianjun
@@ -50,42 +57,101 @@ public class FactAggregationExtractController {
      * @date 2020/11/10 3:14 下午
      */
     @RequestMapping("extractDailyOrMonthly")
-    public Result extractDaily(@RequestBody AggregationExtractFormDTO formDTO) {
+    public Result extractDailyOrMonthly(@RequestBody AggregationExtractFormDTO formDTO) {
         if (StringUtils.isBlank(formDTO.getStartDate()) && StringUtils.isBlank(formDTO.getEndDate())) {
             log.error("抽取日期范围不能为空");
             return new Result().error();
         }
-        if (formDTO.getStartDate().indexOf(StrConstant.HYPHEN) < 0 || formDTO.getEndDate().indexOf(StrConstant.HYPHEN) < 0) {
+        if (!formDTO.getStartDate().contains(StrConstant.HYPHEN) || !formDTO.getEndDate().contains(StrConstant.HYPHEN)) {
             log.error("抽取日期范围格式不正确,yyyy-MM-dd");
             return new Result().error();
         }
+
+        BizTypeEnum bizTypeEnum = null;
+
+        Set<String> bizType = formDTO.getBizType();
+        for (String item : bizType) {
+            bizTypeEnum = BizTypeEnum.getEnum(item);
+            if (bizTypeEnum == null) {
+                log.error("抽取业务类型不正确,BizTypeEnum");
+                throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode());
+            }
+        }
+
+
         List<String> daysBetween = DateUtils.getDaysBetween(formDTO.getStartDate(), formDTO.getEndDate(), DateUtils.DATE_PATTERN, DateUtils.DATE_PATTERN);
-        daysBetween.forEach(dateId -> {
-            Date date = DateUtils.parse(dateId, DateUtils.DATE_PATTERN);
+        for (String dateId : daysBetween) {
             StatsFormDTO param = new StatsFormDTO();
             param.setCustomerId(formDTO.getCustomerId());
             param.setDate(dateId);
 
-            switch (formDTO.getType()) {
-                case "monthly":
+            if ("monthly".equals(formDTO.getType())) {
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.GROUP.getType())) {
                     extractGroupDataMonthly(param);
+                }
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.ARTICLE.getType())) {
                     extractArticleDataMonthlyAndQuarterly(param);
+                }
+            } else {
+                //todo 如果要加方法 记得这个枚举里要加
+                int threadCount = bizType.isEmpty() ? BizTypeEnum.values().length : bizType.size();
+                System.out.println(threadCount);
+                CountDownLatch countDownLatch = ThreadUtil.newCountDownLatch(threadCount);
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.USER.getType())) {
+                    ThreadUtil.execute(() -> {
+                        extractUserDataDaily(param);
+                        countDownLatch.countDown();
+                    });
+                }
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.GROUP.getType())) {
+                    ThreadUtil.execute(() -> {
+                        extractGroupDataDaily(param);
+                        countDownLatch.countDown();
+                    });
+                }
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.TOPIC.getType())) {
+                    ThreadUtil.execute(() -> {
+                        extractTopicDataDaily(param);
+                        countDownLatch.countDown();
+                    });
+                }
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.ISSUE.getType())) {
+                    ThreadUtil.execute(() -> {
+                        extractIssueDataDaily(param);
+                        countDownLatch.countDown();
+                    });
+                }
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.PROJECT.getType())) {
+                    ThreadUtil.execute(() -> {
+                        extractProjectDataDaily(param);
+                        countDownLatch.countDown();
+                    });
+                }
+                if (bizType.isEmpty() || bizType.contains(BizTypeEnum.ARTICLE.getType())) {
+                    ThreadUtil.execute(() -> {
+                        extractAtricleDataDaily(param);
+                        countDownLatch.countDown();
+                    });
+                }
+                try {
+                    //如果半小时还没执行完 则中断 说明执行方法有问题 要优化
+                    countDownLatch.await(NumConstant.THIRTY, TimeUnit.MINUTES);
+                } catch (InterruptedException e) {
+                    log.error("extractDailyOrMonthly dateId:{} 始终没有结束 中断操作 InterruptedException", dateId);
                     break;
-                default:
-                    extractUserDataDaily(param);
-                    extractGroupDataDaily(param);
-                    extractTopicDataDaily(param);
-                    extractIssueDataDaily(param);
-                    extractProjectDataDaily(param);
-                    extractAtricleDataDaily(param);
+                }
             }
-        });
+
+            log.info("extractDailyOrMonthly dateId:{} run end", dateId);
+        }
+
         return new Result();
     }
 
     private void extractUserDataDaily(StatsFormDTO formDTO) {
         try {
             statsUserService.partition(formDTO);
+            log.info("extractUserDataDaily end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【用户】数据失败", e);
         }
@@ -103,6 +169,7 @@ public class FactAggregationExtractController {
     private void extractIssueDataDaily(StatsFormDTO formDTO) {
         try {
             statsIssueService.agencyGridIssueStats(formDTO);
+            log.info("extractIssueDataDaily end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【议题】数据失败", e);
         }
@@ -112,6 +179,7 @@ public class FactAggregationExtractController {
         try {
             statsProjectService.gridProjectStats(formDTO);
             statsProjectService.agencyProjectStats(formDTO);
+            log.info("extractProjectDataDaily end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【项目】数据失败", e);
         }
@@ -122,6 +190,7 @@ public class FactAggregationExtractController {
             statsPublicityService.articleSummaryDailyStatsjob(formDTO);
             statsPublicityService.tagUsedDailyStatsjob(formDTO);
             statsPublicityService.tagViewedDailyStatsjob(formDTO);
+            log.info("extractAtricleDataDaily end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【文章】数据失败", e);
         }
@@ -135,6 +204,7 @@ public class FactAggregationExtractController {
 
             statsGroupService.groupGridDaily(groupStatsFormDTO);
             statsGroupService.groupAgencyDaily(groupStatsFormDTO);
+            log.info("extractGroupDataDaily end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【小组】数据失败", e);
         }
@@ -147,6 +217,7 @@ public class FactAggregationExtractController {
             groupStatsFormDTO.setCustomerId(formDTO.getCustomerId());
 
             statsGroupService.groupAgencyMonthly(groupStatsFormDTO);
+            log.info("extractGroupDataMonthly end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【小组】数据失败", e);
         }
@@ -158,6 +229,7 @@ public class FactAggregationExtractController {
             statsPublicityService.tagUsedQuarterlyStatsjob(formDTO);
             statsPublicityService.tagViewedMonthlyStatsjob(formDTO);
             statsPublicityService.tagViewedQuarterlyStatsjob(formDTO);
+            log.info("extractArticleDataMonthlyAndQuarterly end param:{}", JSON.toJSONString(formDTO));
         } catch (Exception e) {
             log.error("抽取【文章】数据失败", e);
         }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
index ca28b9fd3e..3b1d1c45c8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
@@ -77,7 +77,6 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         }
         //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
         if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
-            log.info("单独统计客户机关-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId());
             customerAgencyStats(formDTO.getCustomerId(), date);
         } else {
             int pageNo = 1;
@@ -88,7 +87,6 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 if (!CollectionUtils.isEmpty(customerIdList)) {
                     for (String customerId : customerIdList) {
                         try {
-                            log.info("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId);
                             //遍历统计每一个客户数据
                             customerAgencyStats(customerId, date);
                         } catch (Exception e) {
@@ -110,13 +108,11 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
 
         //2:根据客户Id查询机关维度表数据
-        log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询机关维度数据，对应客户Id:" + customerId);
         DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
         dimAgencyDTO.setCustomerId(customerId);
         List<DimAgencyDTO> dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
 
         //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据)
-        log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表已结案数据，对应客户Id:" + customerId);
         ProjectEntity projectEntity = new ProjectEntity();
         projectEntity.setCustomerId(customerId);
         projectEntity.setCreatedTime(date);
@@ -124,7 +120,6 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         List<ProjectEntity> projectList = projectService.getProjectList(projectEntity);
 
         //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据)
-        log.info("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据，对应客户Id:" + customerId);
         List<ProjectProcessEntity> processList = projectProcessService.getProcessList(projectEntity);
 
         //20210721 sun 业务逻辑调整，网格删除，组织没有删除情况，相应的组织层级数据统计应舍弃以删除网格数据  start
@@ -134,21 +129,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         if (list.size() > NumConstant.ZERO) {
             Map<String, String> map = list.stream().collect(Collectors.toMap(String::toString, v -> v, (c1, c2) -> c1));
             //4-2.遍历删除项目主表查询的无效数据
-            Iterator<ProjectEntity> proiter = projectList.iterator();
-            while (proiter.hasNext()) {
-                ProjectEntity next = proiter.next();
-                if (map.containsKey(next.getId())) {
-                    proiter.remove();
-                }
-            }
+            projectList.removeIf(next -> map.containsKey(next.getId()));
             //4-3.遍历删除项目节点表查询的无效数据
-            Iterator<ProjectProcessEntity> iterator = processList.iterator();
-            while (iterator.hasNext()) {
-                ProjectProcessEntity next = iterator.next();
-                if (map.containsKey(next.getProjectId())) {
-                    iterator.remove();
-                }
-            }
+            processList.removeIf(next -> map.containsKey(next.getProjectId()));
         }
         //20210721 sun  end
 
@@ -156,21 +139,17 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) {
             //5.1:执行机关日数据统计
             try {
-                log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:" + customerId);
                 agencyDateProjectStats(customerId, dimId, date, dimAgencyList, projectList, processList);
             } catch (Exception e) {
                 log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyDateProjectStats", customerId, dimId.getDateId()), e);
             }
 
             //5.2:执行机关月数据统计
-            //if (Calendar.getInstance().get(Calendar.DATE) == 1) {
             try {
-                log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法，方法名:agencyMonthProjectStats,客户Id:" + customerId);
                 agencyMonthProjectStats(customerId, dimId, dimAgencyList);
             } catch (Exception e) {
                 log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyMonthProjectStats", customerId, dimId.getMonthId()), e);
             }
-            //}
         }
 
     }
@@ -404,7 +383,6 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         }
         //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
         if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
-            log.info("单独统计客户网格-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId());
             customerGridStats(formDTO.getCustomerId(), date);
         } else {
             int pageNo = 1;
@@ -415,11 +393,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 if (!CollectionUtils.isEmpty(customerIdList)) {
                     for (String customerId : customerIdList) {
                         try {
-                            log.info("for循环统计网格-项目-日月数据，当前统计的客户Id:" + customerId);
                             //遍历统计每一个客户数据
                             customerGridStats(customerId, date);
                         } catch (Exception e) {
-                            log.error("项目-网格-数据统计程序错误，对应客户Id:" + customerId, e);
                             log.error("Error creating model JSON", e);
                         }
                     }
@@ -437,11 +413,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date);
 
         //2:根据客户Id查询网格维度表数据
-        log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询网格维度数据，对应客户Id:" + customerId);
         List<DimGridEntity> dimGridList = dimGridService.getGridListByCustomerId(customerId);
 
         //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据)
-        log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目业务表已结案数据，对应客户Id:" + customerId);
         ProjectEntity projectEntity = new ProjectEntity();
         projectEntity.setCustomerId(customerId);
         projectEntity.setCreatedTime(date);
@@ -449,14 +423,12 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         List<ProjectEntity> projectList = projectService.getProjectList(projectEntity);
 
         //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据)
-        log.info("StatsProjectServiceImpl.customerGridStats-根据客户Id查询项目进展表业务数据，对应客户Id:" + customerId);
         List<ProjectProcessEntity> processList = projectProcessService.getProcessList(projectEntity);
 
         //5:网格层级日月统计
         if (null != dimGridList && dimGridList.size() > NumConstant.ZERO) {
             //5.1:执行网格日数据统计
             try {
-                log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关日统计方法，方法名:gridDateProjectStats,客户Id:" + customerId);
                 gridDateProjectStats(customerId, dimId, date, dimGridList, projectList, processList);
             } catch (Exception e) {
                 log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "gridDateProjectStats", customerId, dimId.getDateId()), e);
@@ -464,7 +436,6 @@ public class StatsProjectServiceImpl implements StatsProjectService {
 
             //5.2:执行网格月数据统计
             try {
-                log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关月统计方法，方法名:gridMonthProjectStats,客户Id:" + customerId);
                 gridMonthProjectStats(customerId, dimId, dimGridList);
             } catch (Exception e) {
                 log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "gridMonthProjectStats", customerId, dimId.getMonthId()), e);
@@ -711,4 +682,4 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         return date;
     }
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
index 397fcefa7a..2d77962df5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
@@ -404,7 +404,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 				for (ArticleGridPublishedSummaryDTO summaryDTO : publishedArticleCount) {
 					FactArticlePublishedDepartmentDailyEntity gridDailyEntities = departmentDailyEntityMap.get(summaryDTO.getPublisherId());
 					if (gridDailyEntities == null) {
-						log.error("publicitySummary bizData departmentId:{} not exist in dimDepartment", summaryDTO.getGridId());
+						log.warn("publicitySummary bizData departmentId:{} not exist in dimDepartment", summaryDTO.getGridId());
 						continue;
 					}
 					gridDailyEntities.setArticleTotalCount(summaryDTO.getArticleTotalCount());
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
index 09754ca373..3bda2d3cc5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -290,11 +290,10 @@
             a.ATTACHMENT_URL,
             a.SORT
         from resi_topic t
-        LEFT JOIN resi_topic_attachment a ON t.ID = a.TOPIC_ID
+        LEFT JOIN resi_topic_attachment a ON t.ID = a.TOPIC_ID  AND ATTACHMENT_TYPE = 'image'
         WHERE
             t.del_flag = '0'
-            AND ATTACHMENT_TYPE = 'image'
-            and TOPIC_ID = #{topicId}
+            and t.ID = #{topicId}
     </select>
 
     <select id="selectTopicList" resultType="com.epmet.dto.stats.topic.result.TopicListResultDTO">
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java
index d2a37797fa..9c0942d574 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointUserTotalDetailServiceImpl.java
@@ -23,7 +23,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
-import com.epmet.commons.tools.enums.BizTypeEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -160,10 +159,6 @@ public class BizPointUserTotalDetailServiceImpl extends BaseServiceImpl<BizPoint
         return entity.getTotalPoint();
     }
 
-    public static void main(String[] args) {
-        System.out.println(BizTypeEnum.ACTIVITY.getType());
-    }
-
     /**
      * 小组积分贡献榜
      *

From e196dfcad84bd1818a152151fbaf995219b0c5cf Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 14 Dec 2021 13:11:15 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...srootsGovernDataAbsorptionServiceImpl.java | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
index f9999263ef..efd51f1f90 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.project.result.ProjectLatestOperationResultDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.dto.topic.TopicAttachmentDTO;
 import com.epmet.dto.topic.result.ResiTopicAndImgResultDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
 import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
@@ -289,16 +290,20 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                 //获取图片及话题内容
                 ResiTopicAndImgResultDTO topicInfo = topicService.getTopicAndImgs(project.getTopicId(), "image");
                 if (topicInfo != null) {
-                    diffEntity.setEventImgUrl(topicInfo.getTopicImgList().get(NumConstant.ZERO).getAttachmentUrl());
+                    List<TopicAttachmentDTO> topicImgList = topicInfo.getTopicImgList();
+                    if (!CollectionUtils.isEmpty(topicImgList)){
+                        diffEntity.setEventImgUrl(topicImgList.get(NumConstant.ZERO).getAttachmentUrl());
+                        topicImgList.forEach(img -> {
+                            ScreenDifficultyImgDataEntity imgData = new ScreenDifficultyImgDataEntity();
+                            imgData.setEventId(project.getId());
+                            imgData.setEventImgUrl(img.getAttachmentUrl());
+                            imgData.setSort(img.getSort());
+                            imgDataEntities.add(imgData);
+                            imgData.setCustomerId(param.getCustomerId());
+                        });
+                    }
                     diffEntity.setEventContent(topicInfo.getTopicContent());
-                    topicInfo.getTopicImgList().forEach(img -> {
-                        ScreenDifficultyImgDataEntity imgData = new ScreenDifficultyImgDataEntity();
-                        imgData.setEventId(project.getId());
-                        imgData.setEventImgUrl(img.getAttachmentUrl());
-                        imgData.setSort(img.getSort());
-                        imgDataEntities.add(imgData);
-                        imgData.setCustomerId(param.getCustomerId());
-                    });
+
                     log.info("projectId:{} imgs:{}", project.getId(), imgDataEntities.stream().filter(o -> o.getEventId().equals(project.getId())).count());
                 }