From c61aad2f948b8f5eff604da92322b316d4c84ab1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 9 Oct 2021 18:04:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E6=9A=82=E6=97=B6=E4=BD=8F?= =?UTF-8?q?=E6=8E=89=E4=BB=A3=E7=A0=81=20=E8=B7=91=E4=B8=8B=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=90=8E=E5=86=8D=E5=9B=9E=E5=A4=8D=E5=9B=9E=E6=9D=A5?= =?UTF-8?q?2"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ae986f44 --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index 5b9c230735..279534af85 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -284,19 +284,19 @@ 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); } From b580d6adacb8eac3677d4b75e3d90f51295d7b78 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 9 Oct 2021 18:05:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E6=9A=82=E6=97=B6=E4=BD=8F?= =?UTF-8?q?=E6=8E=89=E4=BB=A3=E7=A0=81=20=E8=B7=91=E4=B8=8B=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=90=8E=E5=86=8D=E5=9B=9E=E5=A4=8D=E5=9B=9E=E6=9D=A5?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c7255c6e --- .../toscreen/impl/ScreenExtractServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index 279534af85..600786782c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/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 { @@ -300,15 +300,15 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { } catch (Exception e) { log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e); } - //extractPartData(customerId, dateId); - //latch.countDown(); + extractPartData(customerId, dateId); + latch.countDown(); log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId); }); - /* try { - //latch.await(); + try { + latch.await(); } catch (InterruptedException e) { log.error("extractDaily run exception", e); - }*/ + } log.info("===== extractDaily method end customerId:{}======",customerId); }