From 2daa3c79bbad08e451c9864377467af21945b85f Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 13 Dec 2021 16:11:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E6=9A=82=E6=97=B6=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E6=8E=89=E5=85=B6=E4=BB=96=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E8=B7=91=E4=B8=80=E4=B8=8B=E8=AF=9D=E9=A2=98=E7=9A=84=20?= =?UTF-8?q?=E9=9C=80=E6=92=A4=E5=9B=9E"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3be462d9 --- .../FactAggregationExtractController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 4208149f00..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 @@ -68,16 +68,16 @@ public class FactAggregationExtractController { switch (formDTO.getType()) { case "monthly": - //extractGroupDataMonthly(param); - //extractArticleDataMonthlyAndQuarterly(param); + extractGroupDataMonthly(param); + extractArticleDataMonthlyAndQuarterly(param); break; default: - //extractUserDataDaily(param); - //extractGroupDataDaily(param); + extractUserDataDaily(param); + extractGroupDataDaily(param); extractTopicDataDaily(param); - //extractIssueDataDaily(param); - //extractProjectDataDaily(param); - //extractAtricleDataDaily(param); + extractIssueDataDaily(param); + extractProjectDataDaily(param); + extractAtricleDataDaily(param); } }); return new Result(); From 3a7134a1472b3712b6956e333cb85c0e88d836e3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 13 Dec 2021 16:27:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=9D=E9=A2=98=20=E8=AE=AE=E9=A2=98=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E9=87=8D=E6=96=B0=E8=B7=91=20=E9=9C=80?= =?UTF-8?q?=E6=92=A4=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FactAggregationExtractController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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..535b5971b1 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 @@ -68,16 +68,16 @@ public class FactAggregationExtractController { switch (formDTO.getType()) { case "monthly": - extractGroupDataMonthly(param); - extractArticleDataMonthlyAndQuarterly(param); +// extractGroupDataMonthly(param); +// extractArticleDataMonthlyAndQuarterly(param); break; default: - extractUserDataDaily(param); - extractGroupDataDaily(param); +// extractUserDataDaily(param); +// extractGroupDataDaily(param); extractTopicDataDaily(param); extractIssueDataDaily(param); extractProjectDataDaily(param); - extractAtricleDataDaily(param); + //extractAtricleDataDaily(param); } }); return new Result();