Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/FactExtractOpenFeignClientFallBack.java

@@ -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);
-    }
-}

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();
     }
 

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);
         });