From 7308e5ae8fa356359f246473e4066677d8fb9c16 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 21:33:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E5=8A=A0log"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9e82a8ba --- .../java/com/epmet/controller/FactOriginExtractController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java index 1e6b6362ff..c61ca790a9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java @@ -53,12 +53,9 @@ public class FactOriginExtractController { factOriginExtractService.extractAll(extractFormDTO); startDate = DateUtils.addDateDays(DateUtils.stringToDate(extractFormDTO.getStartDate(), "yyyyMMdd"), 1); } while (endDate.compareTo(startDate) >= 0); - System.out.println("have params"); } else { - System.out.println("no params"); factOriginExtractService.extractAll(extractFormDTO); } - System.out.println("zxc's log "); return new Result(); } From 9012959144df609d7698d40e48b950637fd03436 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 21 Sep 2020 21:35:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8fallBac?= =?UTF-8?q?k?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FactExtractOpenFeignClientFallBack.java | 210 ------------------ .../impl/FactOriginExtractServiceImpl.java | 1 + 2 files changed, 1 insertion(+), 210 deletions(-) delete mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/FactExtractOpenFeignClientFallBack.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/FactExtractOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/FactExtractOpenFeignClientFallBack.java deleted file mode 100644 index b06cc18485..0000000000 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/FactExtractOpenFeignClientFallBack.java +++ /dev/null @@ -1,210 +0,0 @@ -package com.epmet.feign.impl; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.ModuleUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.StatsFormDTO; -import com.epmet.dto.extract.form.ExtractFormDTO; -import com.epmet.dto.extract.form.ExtractIndexFormDTO; -import com.epmet.dto.group.form.GroupStatsFormDTO; -import com.epmet.dto.issue.form.IssueJobFromDTO; -import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO; -import com.epmet.feign.DataStatisticalOpenFeignClient; -import org.springframework.stereotype.Component; - -/** - * desc: - * - * @return: - * @date: 2020/6/22 9:38 - * @author: jianjun liu - * email:liujianjun@git.elinkit.com.cn - */ -@Component -public class FactExtractOpenFeignClientFallBack implements DataStatisticalOpenFeignClient { - - /** - * desc: 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result articleSummaryDailyStatsjob(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "articleSummaryDailyStatsjob", formDTO); - } - - /** - * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 - * - * @return: - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result tagUsedDailyStatsjob(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedDailyStatsjob", formDTO); - } - - /** - * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedMonthlyStatsjob", formDTO); - } - - /** - * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedQuarterlyStatsjob", formDTO); - } - - /** - * desc: 【日】 统计阅读最多的标签 包含 机关 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result tagViewedDailyStatsjob(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedDailyStatsjob", formDTO); - } - - /** - * desc: 【月】 统计阅读最多的标签 包含 机关 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedMonthlyStatsjob", formDTO); - } - - /** - * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 - * - * @param formDTO - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedQuarterlyStatsjob", formDTO); - } - - @Override - public Result groupGridDaily(GroupStatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupGridDaily", formDTO); - } - - @Override - public Result groupAgencyDaily(GroupStatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyDaily", formDTO); - } - - @Override - public Result groupAgencyMonthly(GroupStatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyMonthly", formDTO); - } - - @Override - public Result agencyGridIssueStats() { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyGridIssueStats"); - } - - @Override - public Result agencyGridIssueStatsOfDate(IssueJobFromDTO fromDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyGridIssueStatsOfDate"); - } - - /** - * @Description 数据统计-项目-机关日月统计 - * @Author sun - */ - @Override - public Result agencyProjectStats(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyProjectStats", formDTO); - } - - /** - * @Description 数据统计-项目-网格日月统计 - * @Author sun - */ - @Override - public Result gridProjectStats(StatsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "gridProjectStats", formDTO); - } - - @Override - public Result initAllDims() { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "initAllDims"); - } - - /** - * @param - * @return - * @Description 执行用户统计 - * @author wangc - * @date 2020.06.29 09:26 - **/ - @Override - public Result execUserStatistical(String date) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execUserStatistical", date); - } - - /** - * @param - * @return - * @Description 执行话题统计 - * @author wangc - * @date 2020.06.29 09:27 - **/ - @Override - public Result execTopicStatistical(String date) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical", date); - } - - @Override - public Result getPartyInfo(CustomerIdAndDateIdFormDTO customerIdAndDateIdFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "getPartyInfo", customerIdAndDateIdFormDTO); - } - - @Override - public Result processPenddingCalculate() { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "processPenddingCalculate"); - } - - /** - * desc: 【日】抽取业务数据到统计库 小组 话题 议题 项目 - * - * @param formDTO - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result factOriginExtractAll(ExtractFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "factOriginExtractAll", formDTO); - } - - /** - * desc: 【月】抽取统计数据到指标库 - * - * @param formDTO - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @Override - public Result indexOriginExtractAll(ExtractIndexFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "indexOriginExtractAll", formDTO); - } -} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginExtractServiceImpl.java index 0a10a193db..53d94d780f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/FactOriginExtractServiceImpl.java @@ -67,6 +67,7 @@ public class FactOriginExtractServiceImpl implements FactOriginExtractService { ExtractFormDTO param = new ExtractFormDTO(); param.setCustomerId(cId); param.setDateId(finalDateId); + // log.warn(); submitJob(param); });