diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index a11e38bab7..46a4554d9b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -25,191 +25,199 @@ import org.springframework.web.bind.annotation.RequestParam; @FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallback = DataStatisticalOpenFeignClientFallBack.class) public interface DataStatisticalOpenFeignClient { - /** - * desc: 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob") - Result articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); - - /** - * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 - * - * @return: - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob") - Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); - - /** - * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob") - Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); - - /** - * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob") - Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); - - /** - * desc: 【日】 统计阅读最多的标签 包含 机关 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob") - Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); - - /** - * desc: 【月】 统计阅读最多的标签 包含 机关 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob") - Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); - - /** - * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - * @param date - */ - @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob") - Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); - - /** - * @Description 统计 “网格小组”， dim：【网格-日】 - * @param - * @author zxc - */ - @PostMapping("/data/stats/statsgroup/groupgriddaily") - Result groupGridDaily(@RequestBody GroupStatsFormDTO formDTO); - - /** - * @Description 统计 “网格小组”， dim：【机关-日】 - * @param - * @author zxc - */ - @PostMapping("/data/stats/statsgroup/groupagencydaily") - Result groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO); - - /** - * @Description 统计 “网格小组”， dim：【机关-月】 - * @param - * @author zxc - */ - @PostMapping("/data/stats/statsgroup/groupagencymonthly") - Result groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO); - - /** - * 议题统计 - * @author zhaoqifeng - * @date 2020/6/23 14:34 - * @param - * @return com.epmet.commons.tools.utils.Result - */ - @PostMapping("/data/stats/statsissue/issuestats") - Result agencyGridIssueStats(); - - /** - * 指定日期统计 - * @author zhaoqifeng - * @date 2020/7/1 15:29 - * @param fromDTO - * @return com.epmet.commons.tools.utils.Result - */ - @PostMapping("/data/stats/statsissue/issuestatsofdate") - Result agencyGridIssueStatsOfDate(@RequestBody IssueJobFromDTO fromDTO); - - /** - * @Description 数据统计-项目-机关日月统计 - * @Author sun - */ - @PostMapping("/data/stats/statsproject/agencyprojectstats") - Result agencyProjectStats(StatsFormDTO formDTO); - - /** - * @Description 数据统计-项目-网格日月统计 - * @Author sun - */ - @PostMapping("/data/stats/statsproject/gridprojectstats") - Result gridProjectStats(StatsFormDTO formDTO); - - /** - * 初始化所有维度 - * - * @return - */ - @PostMapping("/data/stats/dim/all/init") - Result initAllDims(); - - /** - * @Description 执行用户统计 - * @param - * @return - * @author wangc - * @date 2020.06.29 09:26 - **/ - @PostMapping("/data/stats/statsuser/execute") - Result execUserStatistical(@RequestParam(value = "date",required = false) String date); - - /** - * @Description 执行话题统计 - * @param - * @return - * @author wangc - * @date 2020.06.29 09:27 - **/ - @PostMapping("/data/stats/statstopic/execute") - Result execTopicStatistical(@RequestParam(value = "date",required = false) String date); - - /** - * @Description 统计党员 - * @param customerIdAndDateIdFormDTO - * @author zxc - * @date 2020/9/17 3:10 下午 - */ - @PostMapping("/data/stats/dim/statsparty") - Result getPartyInfo(@RequestBody CustomerIdAndDateIdFormDTO customerIdAndDateIdFormDTO); - - /** - * 处理暂停的计算 - * - * @return - */ - @PostMapping("/data/stats/indexcalculate/process-pendding-cals") - Result processPenddingCalculate(); - - /** - * desc: 【日】抽取业务数据到统计库 小组 话题 议题 项目 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "/data/stats/factorigin/extractall") - Result factOriginExtractAll(@RequestBody(required = false) ExtractFormDTO formDTO); - - /** - * ˚ - * desc: 【月】抽取统计数据到指标库 - * - * @date: 2020/6/22 9:09 - * @author: jianjun liu - */ - @PostMapping(value = "/data/stats/indexorigin/extractall") - Result indexOriginExtractAll(@RequestBody(required = false) ExtractIndexFormDTO formDTO); - + /** + * desc: 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob") + Result articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); + + /** + * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 + * + * @return: + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob") + Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); + + /** + * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob") + Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); + + /** + * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob") + Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); + + /** + * desc: 【日】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob") + Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); + + /** + * desc: 【月】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob") + Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); + + /** + * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 + * + * @param date + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob") + Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO); + + /** + * @param + * @Description 统计 “网格小组”， dim：【网格-日】 + * @author zxc + */ + @PostMapping("/data/stats/statsgroup/groupgriddaily") + Result groupGridDaily(@RequestBody GroupStatsFormDTO formDTO); + + /** + * @param + * @Description 统计 “网格小组”， dim：【机关-日】 + * @author zxc + */ + @PostMapping("/data/stats/statsgroup/groupagencydaily") + Result groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO); + + /** + * @param + * @Description 统计 “网格小组”， dim：【机关-月】 + * @author zxc + */ + @PostMapping("/data/stats/statsgroup/groupagencymonthly") + Result groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO); + + /** + * 议题统计 + * + * @param + * @return com.epmet.commons.tools.utils.Result + * @author zhaoqifeng + * @date 2020/6/23 14:34 + */ + @PostMapping("/data/stats/statsissue/issuestats") + Result agencyGridIssueStats(); + + /** + * 指定日期统计 + * + * @param fromDTO + * @return com.epmet.commons.tools.utils.Result + * @author zhaoqifeng + * @date 2020/7/1 15:29 + */ + @PostMapping("/data/stats/statsissue/issuestatsofdate") + Result agencyGridIssueStatsOfDate(@RequestBody IssueJobFromDTO fromDTO); + + /** + * @Description 数据统计-项目-机关日月统计 + * @Author sun + */ + @PostMapping("/data/stats/statsproject/agencyprojectstats") + Result agencyProjectStats(StatsFormDTO formDTO); + + /** + * @Description 数据统计-项目-网格日月统计 + * @Author sun + */ + @PostMapping("/data/stats/statsproject/gridprojectstats") + Result gridProjectStats(StatsFormDTO formDTO); + + /** + * 初始化所有维度 + * + * @return + */ + @PostMapping("/data/stats/dim/all/init") + Result initAllDims(); + + /** + * @param + * @return + * @Description 执行用户统计 + * @author wangc + * @date 2020.06.29 09:26 + **/ + @PostMapping("/data/stats/statsuser/execute") + Result execUserStatistical(@RequestParam(value = "date", required = false) String date); + + /** + * @param + * @return + * @Description 执行话题统计 + * @author wangc + * @date 2020.06.29 09:27 + **/ + @PostMapping("/data/stats/statstopic/execute") + Result execTopicStatistical(@RequestParam(value = "date", required = false) String date); + + /** + * @param customerIdAndDateIdFormDTO + * @Description 统计党员 + * @author zxc + * @date 2020/9/17 3:10 下午 + */ + @PostMapping("/data/stats/dim/statsparty") + Result getPartyInfo(@RequestBody CustomerIdAndDateIdFormDTO customerIdAndDateIdFormDTO); + + /** + * 处理暂停的计算 + * + * @return + */ + @PostMapping("/data/stats/indexcalculate/process-pendding-cals") + Result processPenddingCalculate(); + + /** + * desc: 【日】抽取业务数据到统计库 小组 话题 议题 项目 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "/data/stats/factorigin/extractall") + Result factOriginExtractAll(@RequestBody(required = false) ExtractFormDTO formDTO); + + /** + * ˚ + * desc: 【月】抽取统计数据到指标库 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "/data/stats/indexorigin/extractall") + Result indexOriginExtractAll(@RequestBody(required = false) ExtractIndexFormDTO formDTO); + + /** + * 初始化维度 + * @return + */ + @PostMapping("/data/stats/eidim/init-all") + Result initAll(); } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java index cec2bb3195..8f0dc0cff2 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -207,4 +207,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp public Result indexOriginExtractAll(ExtractIndexFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "indexOriginExtractAll", formDTO); } + + @Override + public Result initAll() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "initAll"); + } }