Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -163,7 +163,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     public void extractDaily(String customerId, String dateId, boolean isLast) {
         //等待3个线程执行完毕后再 继续执行下一个客户的 避免死锁
         final CountDownLatch latch = new CountDownLatch(NumConstant.FOUR);
-       /* threadPool.submit(() -> {
+        threadPool.submit(() -> {
             //党员基本情况screen_cpc_base_data
             try {
                 partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
@@ -256,7 +256,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             }
             latch.countDown();
             log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
-        });*/
+        });
         threadPool.submit(() -> {
             //治理能力排行screen_govern_rank_data
             try {
@@ -284,31 +284,31 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                 ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
                 extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
                 extractFactGridGovernDailyFromDTO.setDateId(dateId);
-                //factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
+                factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
             } catch (Exception e) {
                 log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
             try {
-               // factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
+                factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
             } catch (Exception e) {
                 log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
 
             try {
-                //factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
+                factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
             } catch (Exception e) {
                 log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
             }
-            //extractPartData(customerId, dateId);
+            extractPartData(customerId, dateId);
-            //latch.countDown();
+            latch.countDown();
             log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
         });
-       /* try {
+        try {
-            //latch.await();
+            latch.await();
         } catch (InterruptedException e) {
             log.error("extractDaily run exception", e);
-        }*/
+        }
         log.info("===== extractDaily method end customerId:{}======",customerId);
     }