定时任务添加时间参数

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

@@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.Date;
-
 /**
  * desc:  数据统计 对外feign client
  *
@@ -29,7 +27,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob")
- Result articleSummaryDailyStatsjob();
+ Result articleSummaryDailyStatsjob(@RequestParam(value = "date",required = false) String date);
 
  /**
   * desc:  定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
@@ -39,7 +37,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob")
- Result tagUsedDailyStatsjob();
+ Result tagUsedDailyStatsjob(@RequestParam(value = "date",required = false) String date);
 
  /**
   * desc:  【月】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -48,7 +46,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob")
- Result tagUsedMonthlyStatsjob();
+ Result tagUsedMonthlyStatsjob(@RequestParam(value = "date",required = false) String date);
 
  /**
   * desc:  【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -57,7 +55,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob")
- Result tagUsedQuarterlyStatsjob();
+ Result tagUsedQuarterlyStatsjob(@RequestParam(value = "date",required = false) String date);
 
  /**
   * desc:  【日】 统计阅读最多的标签 包含 机关 网格
@@ -66,7 +64,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob")
- Result tagViewedDailyStatsjob();
+ Result tagViewedDailyStatsjob(@RequestParam(value = "date",required = false) String date);
 
  /**
   * desc: 【月】 统计阅读最多的标签 包含 机关 网格
@@ -75,16 +73,17 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob")
- Result tagViewedMonthlyStatsjob();
+ Result tagViewedMonthlyStatsjob(@RequestParam(value = "date",required = false) String date);
 
  /**
   * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格
   *
   * @date: 2020/6/22 9:09
   * @author: jianjun liu
+  * @param date
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob")
- Result tagViewedQuarterlyStatsjob();
+ Result tagViewedQuarterlyStatsjob(@RequestParam(value = "date",required = false) String date);
 
  /**
   * @Description  统计 “网格小组”， dim：【网格-日】

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

@@ -7,9 +7,6 @@ import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.stereotype.Component;
 
-
-import java.util.Date;
-
 /**
  * desc:
  *
@@ -28,7 +25,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result articleSummaryDailyStatsjob() {
+    public Result articleSummaryDailyStatsjob(String date) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "articleSummaryDailyStatsjob");
     }
 
@@ -40,7 +37,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedDailyStatsjob() {
+    public Result tagUsedDailyStatsjob(String date) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedDailyStatsjob");
     }
 
@@ -51,7 +48,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedMonthlyStatsjob() {
+    public Result tagUsedMonthlyStatsjob(String date) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedMonthlyStatsjob");
     }
 
@@ -62,7 +59,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedQuarterlyStatsjob() {
+    public Result tagUsedQuarterlyStatsjob(String date) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedQuarterlyStatsjob");
     }
 
@@ -73,7 +70,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedDailyStatsjob() {
+    public Result tagViewedDailyStatsjob(String date) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedDailyStatsjob");
     }
 
@@ -84,7 +81,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedMonthlyStatsjob() {
+    public Result tagViewedMonthlyStatsjob(String date) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedMonthlyStatsjob");
     }
 
@@ -93,10 +90,11 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      *
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
+     * @param date
      */
     @Override
-    public Result tagViewedQuarterlyStatsjob() {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedQuarterlyStatsjob");
+    public Result tagViewedQuarterlyStatsjob(String date) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedQuarterlyStatsjob",date);
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

@@ -961,8 +961,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		String key = pid.concat(StrConstant.UNDER_LINE).concat(tagId);
 		FactTagViewedAgencyDailyEntity parentAgencyDailyEntity = agencyDailyEntityMap.get(key);
 		DimAgencyEntity currentDimAgency = dimAgencyEntityMap.get(pid);
-		if (currentDimAgency == null && !NumConstant.ZERO_STR.equals(pid)) {
-			log.error("setTagViewedData2ParentAgency agencyId:{} not exist in dimAgency", pid);
+		if (currentDimAgency == null) {
 			return;
 		}
 		if (parentAgencyDailyEntity == null) {
@@ -986,8 +985,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 	private void setPublishedData2ParentAgency(Map<String, FactArticlePublishedAgencyDailyEntity> agencyDailyEntityMap, FactArticlePublishedAgencyDailyEntity agencySummary, FactArticlePublishedAgencyDailyEntity summary) {
 		String pid = summary.getPid();
 		FactArticlePublishedAgencyDailyEntity parentAgency = agencyDailyEntityMap.get(pid);
-		if (parentAgency == null && !NumConstant.ZERO_STR.equals(pid)) {
-			log.error("setPublishedData2ParentAgency agencyId:{} not exist in dimAgency", pid);
+		if (parentAgency == null) {
 			return;
 		}
 		parentAgency.setArticleTotalCount(parentAgency.getArticleTotalCount() + agencySummary.getArticleTotalCount());

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java

@@ -18,7 +18,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result articleSummaryDailyStatsjob();
+    Result articleSummaryDailyStatsjob(String date);
 
     /**
      * desc:  定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
@@ -27,7 +27,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagUsedDailyStatsjob();
+    Result tagUsedDailyStatsjob(String date);
 
     /**
      * desc:  【月】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -35,7 +35,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagUsedMonthlyStatsjob();
+    Result tagUsedMonthlyStatsjob(String date);
 
     /**
      * desc:  【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -43,7 +43,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagUsedQuarterlyStatsjob();
+    Result tagUsedQuarterlyStatsjob(String date);
 
     /**
      * desc:  【日】 统计阅读最多的标签 包含 机关 网格
@@ -51,7 +51,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagViewedDailyStatsjob();
+    Result tagViewedDailyStatsjob(String date);
 
     /**
      * desc: 【月，季，年】 统计阅读最多的标签 包含 机关 网格
@@ -59,14 +59,15 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagViewedMonthlyStatsjob();
+    Result tagViewedMonthlyStatsjob(String date);
 
     /**
      * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格
      *
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
+     * @param date
      */
-    Result tagViewedQuarterlyStatsjob();
+    Result tagViewedQuarterlyStatsjob(String date);
 
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java

@@ -1,8 +1,8 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.service.StatsPublicityTaskService;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.service.StatsPublicityTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,8 +21,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result articleSummaryDailyStatsjob() {
-        return dataStatsOpenFeignClient.articleSummaryDailyStatsjob();
+    public Result articleSummaryDailyStatsjob(String date) {
+        return dataStatsOpenFeignClient.articleSummaryDailyStatsjob(date);
     }
 
     /**
@@ -33,8 +33,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedDailyStatsjob() {
-        return dataStatsOpenFeignClient.tagUsedDailyStatsjob();
+    public Result tagUsedDailyStatsjob(String date) {
+        return dataStatsOpenFeignClient.tagUsedDailyStatsjob(date);
     }
 
     /**
@@ -44,8 +44,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedMonthlyStatsjob() {
-        return dataStatsOpenFeignClient.tagUsedMonthlyStatsjob();
+    public Result tagUsedMonthlyStatsjob(String date) {
+        return dataStatsOpenFeignClient.tagUsedMonthlyStatsjob(date);
     }
 
     /**
@@ -55,8 +55,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedQuarterlyStatsjob() {
-        return dataStatsOpenFeignClient.tagUsedQuarterlyStatsjob();
+    public Result tagUsedQuarterlyStatsjob(String date) {
+        return dataStatsOpenFeignClient.tagUsedQuarterlyStatsjob(date);
     }
 
     /**
@@ -66,8 +66,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedDailyStatsjob() {
-        return dataStatsOpenFeignClient.tagViewedDailyStatsjob();
+    public Result tagViewedDailyStatsjob(String date) {
+        return dataStatsOpenFeignClient.tagViewedDailyStatsjob(date);
     }
 
     /**
@@ -77,8 +77,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedMonthlyStatsjob() {
-        return dataStatsOpenFeignClient.tagViewedMonthlyStatsjob();
+    public Result tagViewedMonthlyStatsjob(String date) {
+        return dataStatsOpenFeignClient.tagViewedMonthlyStatsjob(date);
     }
 
     /**
@@ -86,9 +86,10 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      *
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
+     * @param date
      */
     @Override
-    public Result tagViewedQuarterlyStatsjob() {
-        return dataStatsOpenFeignClient.tagViewedQuarterlyStatsjob();
+    public Result tagViewedQuarterlyStatsjob(String date) {
+        return dataStatsOpenFeignClient.tagViewedQuarterlyStatsjob(date);
     }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java

@@ -21,7 +21,7 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.articleSummaryDailyStatsjob();
+		Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(params);
 		if (result.success()) {
 			logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行成功");
 		} else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java

@@ -21,7 +21,7 @@ public class PublicityTagUsedDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagUsedDailyStatsjob();
+		Result result = statsPublicityTaskService.tagUsedDailyStatsjob(params);
 		if (result.success()) {
 			logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行成功");
 		} else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java

@@ -21,7 +21,7 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob();
+		Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(params);
 		if (result.success()) {
 			logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功");
 		} else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java

@@ -21,7 +21,7 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob();
+		Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(params);
 		if (result.success()) {
 			logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功");
 		} else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java

@@ -21,7 +21,7 @@ public class PublicityTagViewedDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagViewedDailyStatsjob();
+		Result result = statsPublicityTaskService.tagViewedDailyStatsjob(params);
 		if (result.success()) {
 			logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行成功");
 		} else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java

@@ -21,7 +21,7 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob();
+		Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(params);
 		if (result.success()) {
 			logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功");
 		} else {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java

@@ -21,7 +21,7 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob();
+		Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(params);
 		if (result.success()) {
 			logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功");
 		} else {