Merge remote-tracking branch 'remotes/origin/dev_public_join' into develop

# Conflicts:
#	epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -70,7 +70,7 @@
         on(diff.ORG_ID=scg.GRID_ID and scg.DEL_FLAG='0')
         WHERE
                 diff.DEL_FLAG = '0'
-            and diff.orgType='grid'
+            and diff.ORG_TYPE='grid'
             and diff.EVENT_STATUS_CODE in('pending','0')
             AND scg.AREA_CODE like concat(#{areaCode},'%')
         ORDER BY

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

@@ -34,17 +34,17 @@
     <!-- 根据地区码查询先锋模范 -->
     <select id="selectFineExampleByAreaCode" resultType="com.epmet.evaluationindex.screen.dto.result.FineExampleResultDTO">
         SELECT
-            CEILING(avg(data.issue_total)) AS issueTotal,
+            CEILING(sum(data.issue_total)) AS issueTotal,
             IFNULL(avg(data.issue_ratio),0) AS issueRatioA,
-            CEILING(avg(data.topic_total)) AS topicTotal,
+            CEILING(sum(data.topic_total)) AS topicTotal,
             IFNULL(avg(data.topic_ratio),0) AS topicRatioA,
-            CEILING(avg(data.shift_project_total)) AS shiftProjectTotal,
+            CEILING(sum(data.shift_project_total)) AS shiftProjectTotal,
             IFNULL(avg(data.shift_project_Ratio),0) AS shiftProjectRatioA,
-            CEILING(avg(data.resolved_project_total)) AS resolvedProjectTotal,
+            CEILING(sum(data.resolved_project_total)) AS resolvedProjectTotal,
             IFNULL(avg(data.resolved_project_ratio),0) AS resolvedProjectRatioA,
-            CEILING(avg(data.publish_issue_total)) AS publishIssueTotal,
+            CEILING(sum(data.publish_issue_total)) AS publishIssueTotal,
             IFNULL(avg(data.publish_issue_ratio),0) AS publishIssueRatioA,
-            CEILING(avg(data.PLAT_ISSUE_TOTAL)) AS platIssueTotal,
+            CEILING(sum(data.PLAT_ISSUE_TOTAL)) AS platIssueTotal,
             IFNULL(avg(data.PLAT_JOIN_PARTY_RATIO),0) AS platJoinPartyRatio,
             DATA_END_TIME as dataEndTime
         FROM

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java

@@ -90,4 +90,29 @@ public class PioneerDataFormDTO implements Serializable {
      * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
      */
     private String dataEndTime;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platIssueTotal
+     */
+    private Integer issueRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platTopicTotal
+     */
+    private Integer topicRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platShiftProjectTotal
+     */
+    private Integer shiftProjectRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platClosedProjectTotal
+     */
+    private Integer resolvedProjectRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platPublishIssueTotal
+     */
+    private Integer publishIssueRatioFm;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/UserJoinFormDTO.java

@@ -50,6 +50,16 @@ public class UserJoinFormDTO implements Serializable {
      */
     private BigDecimal avgIssue;
 
+    /**
+     * 人均议题分子
+     */
+    private Integer avgIssueFz;
+
+    /**
+     * 人均议题分母
+     */
+    private Integer avgIssueFm;
+
     /**
      * 总的参与次数
      */
@@ -59,4 +69,14 @@ public class UserJoinFormDTO implements Serializable {
      * 平均参与度
      */
     private BigDecimal avgJoin;
+
+    /**
+     * 平均参与度分子
+     */
+    private Integer avgJoinFz;
+
+    /**
+     * 平均参与度分母
+     */
+    private Integer avgJoinFm;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenUserJoinEntity.java

@@ -92,6 +92,16 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
      */
     private BigDecimal avgIssue;
 
+    /**
+     * 人均议题分子
+     */
+    private Integer avgIssueFz;
+
+    /**
+     * 人均议题分母
+     */
+    private Integer avgIssueFm;
+
     /**
      * 人均议题较上月增长率(采集的时候后台自己计算)
      */
@@ -107,6 +117,16 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
      */
     private BigDecimal avgJoin;
 
+    /**
+     * 平均参与度分子
+     */
+    private Integer avgJoinFz;
+
+    /**
+     * 平均参与度分母
+     */
+    private Integer avgJoinFm;
+
     /**
      * 平均参与度较上月增长率(采集的时候后台自己计算)
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java

@@ -308,7 +308,7 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
                 boolean inGridClosed = checkIsInGridClosed(governProjectInfoDTO.getGridId(),
                         governProjectInfoDTO.getProjectLogDTOList());
                 if (inGridClosed) {
-                    log.info("projectId=【"+governProjectInfoDTO.getId()+"】属于网格自治");
+                    log.debug("projectId=【"+governProjectInfoDTO.getId()+"】属于网格自治");
                     // 2、在网格内流转结案的，计算以下下值
                     if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(governProjectInfoDTO.getOrigin())) {
                         if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -219,7 +219,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                 List<IssueVoteUserCountResultDTO> voteCountList = factOriginIssueLogDailyService.getVoteCount(formDTO.getCustomerId(), formDTO.getMonthId(), ProjectConstant.AGENCY_ID);
                 Map<String, Integer> orgMemberCount = new HashMap<>();
                 if (!CollectionUtils.isEmpty(issueTotal)) {
-                    //获取每个网格的应表决人数
+                    //获取每个网格的应表决人数 （组成员数去重）
                     List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
                     if (CollectionUtils.isEmpty(memberCountList)) {
                         log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,customerId:{}", formDTO.getCustomerId());

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -17,6 +17,7 @@ import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
 import com.epmet.service.evaluationindex.screen.*;
 import com.epmet.service.stats.DimCustomerService;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +27,7 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.*;
 
 /**
  * @Author zxc
@@ -36,6 +36,11 @@ import java.util.concurrent.Executors;
 @Service
 @Slf4j
 public class ScreenExtractServiceImpl implements ScreenExtractService {
+    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+            .setNameFormat("ScreenExtractServiceImpl-pool-%d").build();
+    ExecutorService threadPool = new ThreadPoolExecutor(3, 6,
+            10L, TimeUnit.MINUTES,
+            new LinkedBlockingQueue<>(500), namedThreadFactory, new ThreadPoolExecutor.CallerRunsPolicy());
 
     @Autowired
     private DimCustomerService dimCustomerService;
@@ -101,13 +106,17 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                 if (StringUtils.isNotBlank(extractOriginFormDTO.getStartDate()) && StringUtils.isNotBlank(extractOriginFormDTO.getEndDate())) {
                     List<String> daysBetween = DateUtils.getDaysBetween(extractOriginFormDTO.getStartDate(), extractOriginFormDTO.getEndDate());
                     daysBetween.forEach(dateId -> {
-                        extractDaily(customerId, dateId);
+                        boolean isLastDay = false;
+                        if (dateId.equals(daysBetween.get(daysBetween.size() - 1))) {
+                            isLastDay = true;
+                        }
+                        extractDaily(customerId, dateId, isLastDay);
                     });
                 } else if (StringUtils.isNotBlank(extractOriginFormDTO.getDateId())) {
-                    extractDaily(customerId, extractOriginFormDTO.getDateId());
+                    extractDaily(customerId, extractOriginFormDTO.getDateId(), true);
                 } else {
                     String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
-                    extractDaily(customerId, dateId);
+                    extractDaily(customerId, dateId, true);
                 }
             });
         }
@@ -135,7 +144,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                 } else if (StringUtils.isNotBlank(formDTO.getMonthId())) {
                     extractMonthly(customerId, formDTO.getMonthId());
                 } else {
-                    String monthId = LocalDate.now().minusMonths(NumConstant.ONE).toString().replace("-", "").substring(NumConstant.ZERO,NumConstant.SIX);
+                    String monthId = LocalDate.now().minusMonths(NumConstant.ONE).toString().replace("-", "").substring(NumConstant.ZERO, NumConstant.SIX);
                     extractMonthly(customerId, monthId);
                 }
             });
@@ -146,135 +155,161 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     /**
      * @param customerId
      * @param dateId
+     * @param isLast     是否是最后一天
      * @Description 按天计算
      * @author zxc
      * @date 2020/9/24 10:16 上午
      */
-    public void extractDaily(String customerId, String dateId) {
+    public void extractDaily(String customerId, String dateId, boolean isLast) {
+        //等待3个线程执行完毕后再 继续执行下一个客户的 避免死锁
+        final CountDownLatch latch = new CountDownLatch(NumConstant.FOUR);
+        threadPool.submit(() -> {
             //党员基本情况screen_cpc_base_data
             try {
-            partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId,dateId);
-        }catch (Exception e){
-            log.error("党员基本情况抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
+                partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
+            } catch (Exception e) {
+                log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
             //先锋模范screen_pioneer_data
+            if (isLast) {
                 try {
                     pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
-        }catch (Exception e){
-            log.error("先锋模范【网格】抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
+                } catch (Exception e) {
+                    log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                 }
                 try {
                     pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
-        }catch (Exception e){
-            log.error("先锋模范【社区】抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
+                } catch (Exception e) {
+                    log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                 }
                 try {
                     pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
-        }catch (Exception e){
-            log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
+                } catch (Exception e) {
+                    log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+                }
             }
+
+            latch.countDown();
+            log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
+        });
+        threadPool.submit(() -> {
             //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
             try {
-            publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId,dateId);
-        }catch (Exception e){
-            log.error("公众参与排行抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
+                publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
+            } catch (Exception e) {
+                log.error("公众参与排行抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
-
+            if (isLast) {
                 //基层治理- 难点赌点 screen_difficulty_data  |  screen_difficulty_img_data
                 try {
                     ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO();
                     param2.setCustomerId(customerId);
                     param2.setDateId(null);
-            log.info("【难点赌点数据上报开始------】 当前客户Id{}",param2.getCustomerId());
+                    log.info("【难点赌点数据上报开始------】 当前客户Id{}", param2.getCustomerId());
                     //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
 
                     screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param2);
-            log.info("【难点赌点数据上报结束------】 当前客户Id{}",param2.getCustomerId());
-        }catch (Exception e){
-            log.error("基层治理-难点赌点抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
+                    log.info("【难点赌点数据上报结束------】 当前客户Id{}", param2.getCustomerId());
+                } catch (Exception e) {
+                    log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                 }
-
+            }
+            latch.countDown();
+            log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
+        });
+        threadPool.submit(() -> {
             ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
             param.setCustomerId(customerId);
             param.setDateId(dateId);
             //中央区 screen_user_total_data
             try {
                 screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
-        }catch (Exception e){
-            log.error("中央区抽取到大屏失败，customerId为："+customerId+"dateId为："+dateId, e);
+            } catch (Exception e) {
+                log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
             try {
                 // 项目(事件)分析按网格_按天统计
                 screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
-        }catch (Exception e){
-            log.error("项目(事件)分析按网格_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
+            } catch (Exception e) {
+                log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
             try {
                 // 项目(事件)分析按组织_按天统计
                 screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
-        }catch (Exception e){
-            log.error("项目(事件)分析按组织_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
+            } catch (Exception e) {
+                log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
             //按天统计：网格内各个分类下的项目总数
-        try{
-            projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId);
-        }catch(Exception e){
-            log.error("按天统计：网格内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e);
+            try {
+                projectCategoryGridDailyService.extractProjectCategoryData(customerId, dateId);
+            } catch (Exception e) {
+                log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
             // 按天统计：组织内各个分类下的项目总数
-        try{
-            projectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,dateId);
-        }catch(Exception e){
-            log.error("按天统计：组织内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e);
+            try {
+                projectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId, dateId);
+            } catch (Exception e) {
+                log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
-
+            latch.countDown();
+            log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
+        });
+        threadPool.submit(() -> {
             //治理能力排行screen_govern_rank_data
             try {
                 governRankDataExtractService.extractGridDataDaily(customerId, dateId);
-        }catch (Exception e){
+            } catch (Exception e) {
                 log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
             try {
                 governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
-        }catch (Exception e){
+            } catch (Exception e) {
                 log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
             try {
                 governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
-        }catch (Exception e){
+            } catch (Exception e) {
                 log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
             try {
                 governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
-        }catch (Exception e){
+            } catch (Exception e) {
                 log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
-        try{
-            ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO=new ExtractFactGridGovernDailyFromDTO();
+            try {
+                ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
                 extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
                 extractFactGridGovernDailyFromDTO.setDateId(dateId);
                 factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
-        }catch(Exception e){
+            } catch (Exception e) {
                 log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
-        try{
+            try {
                 factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
-        }catch(Exception e){
+            } catch (Exception e) {
                 log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
-        try{
+            try {
                 factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
-        }catch(Exception e){
+            } catch (Exception e) {
                 log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
             extractPartData(customerId, dateId);
-        log.info("===== extractDaily method end ======");
+            latch.countDown();
+            log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
+        });
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            log.error("extractDaily run exception", e);
+        }
+        log.info("===== extractDaily method end customerId:{}======",customerId);
     }
 
     @Override
@@ -283,11 +318,11 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         param.setCustomerId(customerId);
         param.setDateId(dateId);
 
-        try{
+        try {
             //大屏项目数据抽取_按天抽取
             screenProjectSettleService.extractScreenData(param);
-        }catch (Exception e){
-            log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
+        } catch (Exception e) {
+            log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
         }
         try{
             //dateId可以为空，如果为空重新计算当前客户下所有的项目的分数
@@ -311,56 +346,56 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         //基层治理-公众参与screen_user_join
         try {
             publicPartExtractService.extractTotalDataMonthly(formDTO);
-        }catch (Exception e){
-            log.error("基层治理-公众参与抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("基层治理-公众参与抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         //治理能力排行screen_govern_rank_data
         try {
             governRankDataExtractService.extractGridData(customerId, monthId);
-        }catch (Exception e){
-            log.error("治理能力排行【网格】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("治理能力排行【网格】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         try {
             governRankDataExtractService.extractCommunityData(customerId, monthId);
-        }catch (Exception e){
-            log.error("治理能力排行【社区】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("治理能力排行【社区】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         try {
             governRankDataExtractService.extractStreetData(customerId, monthId);
-        }catch (Exception e){
-            log.error("治理能力排行【街道】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("治理能力排行【街道】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         try {
             governRankDataExtractService.extractDistrictData(customerId, monthId);
-        }catch (Exception e){
-            log.error("治理能力排行【全区】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("治理能力排行【全区】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         //先进排行 screen_org_rank_data
         try {
             orgRankExtractService.extractGridData(customerId, monthId);
-        }catch (Exception e){
-            log.error("先进排行【网格】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("先进排行【网格】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         try {
             orgRankExtractService.extractCommunityData(customerId, monthId);
-        }catch (Exception e){
-            log.error("先进排行【社区】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("先进排行【社区】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         try {
             orgRankExtractService.extractStreetData(customerId, monthId);
-        }catch (Exception e){
-            log.error("先进排行【街道】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("先进排行【街道】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         try {
             orgRankExtractService.extractDistrictData(customerId, monthId);
-        }catch (Exception e){
-            log.error("先进排行【全区】抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("先进排行【全区】抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         // 党建引领 screen_party_branch_data,screen_party_link_masses_data
         try {
             partyGuideService.partyGuideExtract(formDTO);
-        }catch (Exception e){
-            log.error("党建引领抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
+        } catch (Exception e) {
+            log.error("党建引领抽取到大屏失败，参数为：" + JSON.toJSONString(formDTO), e);
         }
         try {
             //基层治理 - 热心市民 screen_party_user_rank_data
@@ -368,20 +403,20 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             param.setCustomerId(customerId);
             param.setDateId(monthId);
             screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
-        }catch(Exception e){
+        } catch (Exception e) {
             log.error("大屏热心市民/党员得分数据写入失败，参数为：{}" + JSON.toJSONString(formDTO), e);
         }
         try {
             // 项目(事件)数量分析按网格_按月统计
             screenProjectQuantityGridMonthlyService.extractionProjectGridMonthly(customerId, monthId);
-        }catch (Exception e){
-            log.error("项目(事件)数量分析按网格_按月统计失败，参数为{}" + JSON.toJSONString(formDTO),e);
+        } catch (Exception e) {
+            log.error("项目(事件)数量分析按网格_按月统计失败，参数为{}" + JSON.toJSONString(formDTO), e);
         }
         try {
             // 项目(事件)数量分析按组织_按月统计
             screenProjectQuantityOrgMonthlyService.extractionProjectOrgMonthly(customerId, monthId);
-        }catch (Exception e){
-            log.error("项目(事件)数量分析按组织_按月统计失败，参数为{}" + JSON.toJSONString(formDTO),e);
+        } catch (Exception e) {
+            log.error("项目(事件)数量分析按组织_按月统计失败，参数为{}" + JSON.toJSONString(formDTO), e);
         }
         //此方法保持在最后即可   计算指标分数 todo 优化 手动创建线程池 控制任务数量
         ExecutorService pool = Executors.newSingleThreadExecutor();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenGrassrootsGovernDataAbsorptionServiceImpl.java

@@ -391,8 +391,8 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
             name.deleteCharAt(name.length() - NumConstant.ONE);
             diffEntity.setEventCategoryCode(code.toString());
             diffEntity.setEventCategoryName(name.toString());
-            log.info("code:{}",code.toString());
-            log.info("name:{}",name.toString());
+            log.debug("code:{}",code.toString());
+            log.debug("name:{}",name.toString());
         });
 
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java

@@ -547,7 +547,7 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertPioneerData(PioneerDataListFormDTO formDTO, String customerId) {
-        if (formDTO.getIsFirst()) {
+        if (formDTO.getIsFirst() && !CollectionUtils.isEmpty(formDTO.getDataList())) {
             int deleteNum;
             do {
                 deleteNum = screenPioneerDataDao.deletePioneerDataByCustomerId(customerId, IndexCalConstant.DELETE_SIZE);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java

@@ -15,6 +15,7 @@ import com.epmet.service.org.CustomerAgencyService;
 import com.epmet.service.stats.ScreenCentralZoneDataExtractService;
 import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -184,6 +185,7 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
             //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
             o.setGridMemberTotal(gridManagerMap.getOrDefault(orgId, NumConstant.ZERO));
         });
-        return result;
+        List<ScreenUserTotalDataEntity> newResult = result.stream().filter(o -> StringUtils.isNotBlank(o.getParentId())).collect(Collectors.toList());
+        return newResult;
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml

@@ -51,7 +51,12 @@
         CREATED_TIME,
         UPDATED_BY,
         UPDATED_TIME,
-        DATA_END_TIME
+        DATA_END_TIME,
+        PLAT_ISSUE_TOTAL,
+        PLAT_TOPIC_TOTAL,
+        PLAT_SHIFT_PROJECT_TOTAL,
+        PLAT_CLOSED_PROJECT_TOTAL,
+        PLAT_PUBLISH_ISSUE_TOTAL
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -78,7 +83,12 @@
             now(),
             'APP_USER',
             now(),
-            #{item.dataEndTime}
+            #{item.dataEndTime},
+            #{item.issueRatioFm},
+            #{item.topicRatioFm},
+            #{item.shiftProjectRatioFm},
+            #{item.resolvedProjectRatioFm},
+            #{item.publishIssueRatioFm}
             )
         </foreach>
     </insert>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserJoinDao.xml

@@ -41,9 +41,13 @@
         JOIN_TOTAL_UP_RATE,
         JOIN_TOTAL_UP_FLAG,
         AVG_ISSUE,
+        AVG_ISSUE_FZ,
+        AVG_ISSUE_FM,
         AVG_ISSUE_UP_RATE,
         AVG_ISSUE_UP_FLAG,
         AVG_JOIN,
+        AVG_JOIN_FZ,
+        AVG_JOIN_FM,
         AGVG_JOIN_UP_RATE,
         AGVG_JOIN_UP_FLAG,
         DEL_FLAG,
@@ -69,10 +73,14 @@
             #{item.joinTotalUpFlag},
 
             #{item.avgIssue},
+            #{item.avgIssueFz},
+            #{item.avgIssueFm},
             #{item.avgIssueUpRate},
             #{item.avgIssueUpFlag},
 
             #{item.avgJoin},
+            #{item.avgIssueFz},
+            #{item.avgIssueFm},
             #{item.agvgJoinUpRate},
             #{item.agvgJoinUpFlag},
             0,