Merge remote-tracking branch 'origin/dev_temp' into dev_temp

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

@@ -15,7 +15,7 @@
             screen_project_data
         WHERE
             del_flag = '0'
-            <if test="level != null">
+            <if test="level != null and level.trim()!=''">
                 and project_level = #{level}
             </if>
             <if test="ids != null">

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

@@ -11,6 +11,10 @@ import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
+import com.epmet.service.evaluationindex.screen.ScreenProjectGridDailyService;
+import com.epmet.service.evaluationindex.screen.ScreenProjectOrgDailyService;
+import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityGridMonthlyService;
+import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
 import com.epmet.service.stats.DimCustomerService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -50,11 +54,19 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private PublicPartiTotalDataExtractService publicPartiTotalDataExtractService;
     @Autowired
     private IndexCalculateService indexCalculateService;
-
     @Autowired
     private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService;
     @Autowired
     private ScreenGrassrootsGovernDataAbsorptionService screenGrassrootsGovernDataAbsorptionService;
+    @Autowired
+    private ScreenProjectQuantityGridMonthlyService screenProjectQuantityGridMonthlyService;
+    @Autowired
+    private ScreenProjectQuantityOrgMonthlyService screenProjectQuantityOrgMonthlyService;
+    @Autowired
+    private ScreenProjectGridDailyService screenProjectGridDailyService;
+    @Autowired
+    private ScreenProjectOrgDailyService screenProjectOrgDailyService;
+
     /**
      * @param extractOriginFormDTO
      * @Description 抽取数据到大屏【天】
@@ -171,6 +183,18 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         }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);
+        }
+        try {
+            // 项目(事件)分析按组织_按天统计
+            screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
+        }catch (Exception e){
+            log.error("项目(事件)分析按组织_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
+        }
         log.info("===== extractDaily method end ======");
     }
 
@@ -247,6 +271,18 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         }catch(Exception e){
             log.error("大屏热心市民/党员得分数据写入失败，参数为：{}" + JSON.toJSONString(formDTO), e);
         }
+        try {
+            // 项目(事件)数量分析按网格_按月统计
+            screenProjectQuantityGridMonthlyService.extractionProjectGridMonthly(customerId, monthId);
+        }catch (Exception e){
+            log.error("项目(事件)数量分析按网格_按月统计失败，参数为{}" + JSON.toJSONString(formDTO),e);
+        }
+        try {
+            // 项目(事件)数量分析按组织_按月统计
+            screenProjectQuantityOrgMonthlyService.extractionProjectOrgMonthly(customerId, monthId);
+        }catch (Exception e){
+            log.error("项目(事件)数量分析按组织_按月统计失败，参数为{}" + JSON.toJSONString(formDTO),e);
+        }
         //此方法保持在最后即可   计算指标分数 todo 优化 手动创建线程池 控制任务数量
         ExecutorService pool = Executors.newSingleThreadExecutor();
         pool.submit(() -> {