Merge remote-tracking branch 'remotes/origin/dev' into release

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@@ -8,6 +8,7 @@ import ch.qos.logback.classic.spi.StackTraceElementProxy;
 import ch.qos.logback.core.spi.FilterReply;
 import com.epmet.commons.tools.dto.form.DingTalkTextMsg;
 import com.epmet.commons.tools.utils.DingdingMsgSender;
+import com.epmet.commons.tools.utils.IpUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +39,8 @@ public class LogMsgSendFilter extends LevelFilter {
 
 				stringBuilder.append("告警级别：" + event.getLevel());
 				stringBuilder.append("\n");
+				stringBuilder.append("IP地址：" + IpUtils.getServerIp());
+				stringBuilder.append("\n");
 				stringBuilder.append("故障时间：" + formatLongTime2Str(event.getTimeStamp()));
 				stringBuilder.append("\n");
 				stringBuilder.append("TraceId：" + Thread.currentThread().getName());

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java

@@ -13,6 +13,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
 
 /**
  * IP工具类
@@ -48,4 +52,33 @@ public class IpUtils {
 
         return ip;
     }
+
+    /**
+     * desc:获取本地Ip
+     * @return
+     */
+    public static String  getServerIp(){
+        String SERVER_IP = "";
+        try {
+            Enumeration netInterfaces = NetworkInterface.getNetworkInterfaces();
+            InetAddress ip = null;
+            while (netInterfaces.hasMoreElements()) {
+                NetworkInterface ni = (NetworkInterface) netInterfaces
+                        .nextElement();
+                ip = ni.getInetAddresses().nextElement();
+                SERVER_IP = ip.getHostAddress();
+                if (!ip.isSiteLocalAddress() && !ip.isLoopbackAddress()
+                        && ip.getHostAddress().indexOf(":") == -1) {
+                    SERVER_IP = ip.getHostAddress();
+                    break;
+                }else{
+                    ip = null;
+                }
+            }
+        } catch (SocketException e) {
+            logger.error("IpUtils getServerIp exception ", e);
+        }
+
+        return SERVER_IP;
+    }
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/ProjectStatsFormDTO.java → epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/StatsFormDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.dto.project.form;
+package com.epmet.dto;
 
 import lombok.Data;
 
@@ -6,20 +6,20 @@ import java.io.Serializable;
 
 /**
  * @Author sun
- * 项目数据统计接口入参（方便后期可以手动调用）
+ * 数据统计接口入参（方便后期可以手动调用）
  */
 @Data
-public class ProjectStatsFormDTO implements Serializable {
+public class StatsFormDTO implements Serializable {
 
     private static final long serialVersionUID = -3634745091993094743L;
 
     /**
      * 客户Id
      */
-    private String customerId;
+    private String customerId = "";
     /**
      * 需要执行的日期（格式：yyyy-MM-dd）2020-01-01
      */
-    private String date;
+    private String date = "";
 
 }

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

@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack;
@@ -28,7 +29,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob")
- Result articleSummaryDailyStatsjob(@RequestParam(value = "date",required = false) String date);
+ Result articleSummaryDailyStatsjob(StatsFormDTO formDTO);
 
  /**
   * desc:  定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
@@ -38,7 +39,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob")
- Result tagUsedDailyStatsjob(@RequestParam(value = "date",required = false) String date);
+ Result tagUsedDailyStatsjob(StatsFormDTO formDTO);
 
  /**
   * desc:  【月】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -47,7 +48,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob")
- Result tagUsedMonthlyStatsjob(@RequestParam(value = "date",required = false) String date);
+ Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO);
 
  /**
   * desc:  【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -56,7 +57,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob")
- Result tagUsedQuarterlyStatsjob(@RequestParam(value = "date",required = false) String date);
+ Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO);
 
  /**
   * desc:  【日】 统计阅读最多的标签 包含 机关 网格
@@ -65,7 +66,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob")
- Result tagViewedDailyStatsjob(@RequestParam(value = "date",required = false) String date);
+ Result tagViewedDailyStatsjob(StatsFormDTO formDTO);
 
  /**
   * desc: 【月】 统计阅读最多的标签 包含 机关 网格
@@ -74,7 +75,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob")
- Result tagViewedMonthlyStatsjob(@RequestParam(value = "date",required = false) String date);
+ Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO);
 
  /**
   * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格
@@ -84,7 +85,7 @@ public interface DataStatisticalOpenFeignClient {
   * @param date
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob")
- Result tagViewedQuarterlyStatsjob(@RequestParam(value = "date",required = false) String date);
+ Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO);
 
  /**
   * @Description  统计 “网格小组”， dim：【网格-日】
@@ -135,14 +136,14 @@ public interface DataStatisticalOpenFeignClient {
   * @Author sun
   */
  @PostMapping("/data/stats/statsproject/agencyprojectstats")
- Result agencyProjectStats();
+ Result agencyProjectStats(StatsFormDTO formDTO);
 
  /**
   * @Description 数据统计-项目-网格日月统计
   * @Author sun
   */
  @PostMapping("/data/stats/statsproject/gridprojectstats")
- Result gridProjectStats();
+ Result gridProjectStats(StatsFormDTO formDTO);
 
  /**
   * 初始化所有维度

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

@@ -3,6 +3,7 @@ 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.group.form.GroupStatsFormDTO;
 import com.epmet.dto.issue.form.IssueJobFromDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
@@ -26,8 +27,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result articleSummaryDailyStatsjob(String date) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "articleSummaryDailyStatsjob");
+    public Result articleSummaryDailyStatsjob(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "articleSummaryDailyStatsjob",formDTO);
     }
 
     /**
@@ -38,8 +39,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedDailyStatsjob(String date) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedDailyStatsjob");
+    public Result tagUsedDailyStatsjob(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedDailyStatsjob",formDTO);
     }
 
     /**
@@ -49,8 +50,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedMonthlyStatsjob(String date) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedMonthlyStatsjob");
+    public Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedMonthlyStatsjob",formDTO);
     }
 
     /**
@@ -60,8 +61,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedQuarterlyStatsjob(String date) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedQuarterlyStatsjob");
+    public Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedQuarterlyStatsjob",formDTO);
     }
 
     /**
@@ -71,8 +72,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedDailyStatsjob(String date) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedDailyStatsjob");
+    public Result tagViewedDailyStatsjob(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedDailyStatsjob",formDTO);
     }
 
     /**
@@ -82,8 +83,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedMonthlyStatsjob(String date) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedMonthlyStatsjob");
+    public Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedMonthlyStatsjob",formDTO);
     }
 
     /**
@@ -91,11 +92,11 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      *
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
-     * @param date
+     * @param formDTO
      */
     @Override
-    public Result tagViewedQuarterlyStatsjob(String date) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedQuarterlyStatsjob",date);
+    public Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedQuarterlyStatsjob",formDTO);
     }
 
     @Override
@@ -128,8 +129,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @Author sun
      */
     @Override
-    public Result agencyProjectStats() {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyProjectStats");
+    public Result agencyProjectStats(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "agencyProjectStats", formDTO);
     }
 
     /**
@@ -137,8 +138,8 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
      * @Author sun
      */
     @Override
-    public Result gridProjectStats() {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "gridProjectStats");
+    public Result gridProjectStats(StatsFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "gridProjectStats", formDTO);
     }
 
     @Override

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.28
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.29
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.28</version>
+    <version>0.3.29</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java

@@ -1,7 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.project.form.ProjectStatsFormDTO;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,7 +25,7 @@ public class StatsProjectController {
      * @Description 数据-项目-机关日(月)统计
      **/
     @PostMapping("agencyprojectstats")
-    public Result agencyProjectStats(@RequestBody ProjectStatsFormDTO formDTO) {
+    public Result agencyProjectStats(@RequestBody(required = false) StatsFormDTO formDTO) {
         statsProjectService.agencyProjectStats(formDTO);
         return new Result();
     }
@@ -35,7 +35,7 @@ public class StatsProjectController {
      * @Description 数据-项目-网格日(月)统计
      **/
     @PostMapping("gridprojectstats")
-    public Result gridProjectStats(@RequestBody ProjectStatsFormDTO formDTO) {
+    public Result gridProjectStats(@RequestBody(required = false) StatsFormDTO formDTO) {
         statsProjectService.gridProjectStats(formDTO);
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java

@@ -1,13 +1,14 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
 import java.util.concurrent.ExecutorService;
 
 /**
@@ -26,77 +27,77 @@ public class StatsPublicityController {
 	/**
 	 * desc:【日】统计文章总数及在线文章总数 包含 机关 部门 网格
 	 *
-	 * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据
+	 * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
 	 * @return
 	 */
 	@PostMapping(value = "articleSummaryDailyStatsjob")
-	public Result<Boolean> articleSummaryDailyStatsjob(Date statsDate) {
-		return new Result<Boolean>().ok(statsPublicityService.articleSummaryDailyStatsjob(statsDate));
+	public Result<Boolean> articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		return new Result<Boolean>().ok(statsPublicityService.articleSummaryDailyStatsjob(formDTO));
 	}
 
 	/**
 	 * desc:【日】 统计发表文章最多的分类 包含 机关 部门 网格
 	 *
-	 * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据
+	 * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
 	 * @return
 	 */
 	@PostMapping(value = "tagUsedDailyStatsjob")
-	public Result<Boolean> tagUsedDailyStatsjob(Date statsDate) {
-		return new Result<Boolean>().ok(statsPublicityService.tagUsedDailyStatsjob(statsDate));
+	public Result<Boolean> tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		return new Result<Boolean>().ok(statsPublicityService.tagUsedDailyStatsjob(formDTO));
 	}
 
 	/**
 	 * desc:【月,季，年】 统计发表文章最多的分类 包含 机关 部门 网格
 	 *
-	 * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据
+	 * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
 	 * @return
 	 */
 	@PostMapping(value = "tagUsedMonthlyStatsjob")
-	public Result<Boolean> tagUsedMonthlyStatsjob(Date statsDate) {
-		return new Result<Boolean>().ok(statsPublicityService.tagUsedMonthlyStatsjob(statsDate));
+	public Result<Boolean> tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		return new Result<Boolean>().ok(statsPublicityService.tagUsedMonthlyStatsjob(formDTO));
 	}
 
 	/**
 	 * desc:【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
 	 *
-	 * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据
+	 * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
 	 * @return
 	 */
 	@PostMapping(value = "tagUsedQuarterlyStatsjob")
-	public Result<Boolean> tagUsedQuarterlyStatsjob(Date statsDate) {
-		return new Result<Boolean>().ok(statsPublicityService.tagUsedQuarterlyStatsjob(statsDate));
+	public Result<Boolean> tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		return new Result<Boolean>().ok(statsPublicityService.tagUsedQuarterlyStatsjob(formDTO));
 	}
 
 	/**
 	 * desc:【日】 统计阅读最多的标签 包含 机关 网格
 	 *
-	 * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据
+	 * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
 	 * @return
 	 */
 	@PostMapping(value = "tagViewedDailyStatsjob")
-	public Result<Boolean> tagViewedDailyStatsjob(Date statsDate) {
-		return new Result<Boolean>().ok(statsPublicityService.tagViewedDailyStatsjob(statsDate));
+	public Result<Boolean> tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		return new Result<Boolean>().ok(statsPublicityService.tagViewedDailyStatsjob(formDTO));
 	}
 
 	/**
 	 * desc:【月】 统计阅读最多的标签 包含 机关 网格
 	 *
-	 * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据
+	 * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
 	 * @return
 	 */
 	@PostMapping(value = "tagViewedMonthlyStatsjob")
-	public Result<Boolean> tagViewedMonthlyStatsjob(Date statsDate) {
-		return new Result<Boolean>().ok(statsPublicityService.tagViewedMonthlyStatsjob(statsDate));
+	public Result<Boolean> tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		return new Result<Boolean>().ok(statsPublicityService.tagViewedMonthlyStatsjob(formDTO));
 	}
 
 	/**
 	 * desc:【季，年】 统计阅读最多的标签 包含 机关 网格
 	 *
-	 * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据
+	 * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据
 	 * @return
 	 */
 	@PostMapping(value = "tagViewedQuarterlyStatsjob")
-	public Result<Boolean> tagViewedQuarterlyStatsjob(Date statsDate) {
-		return new Result<Boolean>().ok(statsPublicityService.tagViewedQuarterlyStatsjob(statsDate));
+	public Result<Boolean> tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		return new Result<Boolean>().ok(statsPublicityService.tagViewedQuarterlyStatsjob(formDTO));
 	}
 }

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

@@ -1,6 +1,6 @@
 package com.epmet.service;
 
-import com.epmet.dto.project.form.ProjectStatsFormDTO;
+import com.epmet.dto.StatsFormDTO;
 
 /**
  * 数据统计-项目
@@ -12,11 +12,11 @@ public interface StatsProjectService {
      * @Author sun
      * @Description 数据-项目-机关日(月)统计
      **/
-    void agencyProjectStats(ProjectStatsFormDTO formDTO);
+    void agencyProjectStats(StatsFormDTO formDTO);
 
     /**
      * @Author sun
      * @Description 数据-项目-网格日(月)统计
      **/
-    void gridProjectStats(ProjectStatsFormDTO formDTO);
+    void gridProjectStats(StatsFormDTO formDTO);
 }

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

@@ -1,7 +1,7 @@
 package com.epmet.service;
 
 
-import java.util.Date;
+import com.epmet.dto.StatsFormDTO;
 
 public interface StatsPublicityService {
     /**
@@ -10,8 +10,9 @@ public interface StatsPublicityService {
      * @return: Boolean
      * @date: 2020/6/17 16:11
      * @author: jianjun liu
+     * @param statsDate
      */
-    Boolean articleSummaryDailyStatsjob(Date statsDate);
+    Boolean articleSummaryDailyStatsjob(StatsFormDTO statsDate);
 
 	/**
 	 * desc:  按日 统计每个标签被引用的使用文章数
@@ -19,18 +20,20 @@ public interface StatsPublicityService {
 	 * @return: Boolean
 	 * @date: 2020/6/17 16:11
 	 * @author: jianjun liu
+	 * @param statsDate
 	 */
-	Boolean tagUsedDailyStatsjob(Date statsDate);
+	Boolean tagUsedDailyStatsjob(StatsFormDTO statsDate);
 
 	/**
 	 * desc:   按月 统计每个标签被引用的使用文章数
 	 *
 	 * @param
+	 * @param statsDate
 	 * @return:
 	 * @date: 2020/6/19 18:44
 	 * @author: jianjun liu
 	 */
-	Boolean tagUsedMonthlyStatsjob(Date statsDate);
+	Boolean tagUsedMonthlyStatsjob(StatsFormDTO statsDate);
 
 	/**
 	 * desc: 按季年统计标签被使用次数
@@ -40,7 +43,7 @@ public interface StatsPublicityService {
 	 * @date: 2020/6/20 10:44
 	 * @author: jianjun liu
 	 */
-	Boolean tagUsedQuarterlyStatsjob(Date statsDate);
+	Boolean tagUsedQuarterlyStatsjob(StatsFormDTO statsDate);
 
 	/**
 	 * desc:  按日 统计每个标签的阅读数
@@ -50,7 +53,7 @@ public interface StatsPublicityService {
 	 * @date: 2020/6/20 8:40
 	 * @author: jianjun liu
 	 */
-	Boolean tagViewedDailyStatsjob(Date statsDate);
+	Boolean tagViewedDailyStatsjob(StatsFormDTO statsDate);
 
 	/**
 	 * desc: 按月统计标签被查看次数
@@ -60,7 +63,7 @@ public interface StatsPublicityService {
 	 * @date: 2020/6/20 10:44
 	 * @author: jianjun liu
 	 */
-	Boolean tagViewedMonthlyStatsjob(Date statsDate);
+	Boolean tagViewedMonthlyStatsjob(StatsFormDTO statsDate);
 
 	/**
 	 * desc: 按季年统计标签被查看次数
@@ -70,5 +73,5 @@ public interface StatsPublicityService {
 	 * @date: 2020/6/20 10:44
 	 * @author: jianjun liu
 	 */
-	Boolean tagViewedQuarterlyStatsjob(Date statsDate);
+	Boolean tagViewedQuarterlyStatsjob(StatsFormDTO statsDate);
 }

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

@@ -311,7 +311,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @author zxc
      */
     public DimIdGenerator.DimIdBean getDimIdBean(GroupStatsFormDTO formDTO){
-        if (formDTO.getDate() != null){
+        if (StringUtils.isNotBlank(formDTO.getDate())){
             return DimIdGenerator.getDimIdBean(DateUtils.parse(formDTO.getDate(),DateUtils.DATE_PATTERN));
         }
         ZoneId zoneId = ZoneId.systemDefault();

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

@@ -3,8 +3,8 @@ package com.epmet.service.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ProjectConstant;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.project.form.MonthProjectListFormDTO;
-import com.epmet.dto.project.form.ProjectStatsFormDTO;
 import com.epmet.dto.stats.DimAgencyDTO;
 import com.epmet.entity.issue.IssueEntity;
 import com.epmet.entity.project.ProjectEntity;
@@ -16,12 +16,12 @@ import com.epmet.service.project.ProjectProcessService;
 import com.epmet.service.project.ProjectService;
 import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
@@ -65,14 +65,14 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Description 数据-项目-机关日(月)统计
      **/
     @Override
-    public void agencyProjectStats(ProjectStatsFormDTO formDTO) {
+    public void agencyProjectStats(StatsFormDTO formDTO) {
         Date date = yesterDay();
         //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
-        if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) {
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
             date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
         }
         //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
-        if (null != formDTO.getCustomerId() && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
             log.info("单独统计客户机关-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId());
             customerAgencyStats(formDTO.getCustomerId(), date);
         } else {
@@ -367,14 +367,14 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Description 数据-项目-网格日(月)统计
      **/
     @Override
-    public void gridProjectStats(ProjectStatsFormDTO formDTO) {
+    public void gridProjectStats(StatsFormDTO formDTO) {
         Date date = yesterDay();
         //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行
-        if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) {
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
             date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
         }
         //入参有客户Id的则按客户Id执行，没有的则全部客户都执行
-        if (null != formDTO.getCustomerId() && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
             log.info("单独统计客户网格-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId());
             customerGridStats(formDTO.getCustomerId(), date);
         } else {

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

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DimAgencyConstant;
 import com.epmet.constant.ProjectConstant;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO;
 import com.epmet.dto.voice.ArticleViewedSummaryDTO;
 import com.epmet.entity.stats.*;
@@ -21,6 +22,7 @@ import com.epmet.service.voice.ArticleVisitRecordService;
 import com.epmet.service.voice.TagCustomerService;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -105,23 +107,42 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 	private FactTagViewedAgencyYearlyService factTagViewedAgencyYearlyService;
 
 	@Override
-	public Boolean articleSummaryDailyStatsjob(Date statsDate) {
+	public Boolean articleSummaryDailyStatsjob(StatsFormDTO formDTO) {
+		Date statsDate = getStatsDateFromParam(formDTO);
+		String statsDateStr = DateUtils.format(statsDate);
+		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
 		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
-		if (statsDate == null) {
-			//查询的是昨天及以前的数据
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, -NumConstant.ONE), DateUtils.DATE_PATTERN);
+		//入参有客户Id的则按客户Id执行，没有的则全部客户都执行
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			statsSummaryByCustomerId(dimIdBean, statsDateStr, formDTO.getCustomerId());
 		} else {
-			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		}
-		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
-		String statsDateStr = DateUtils.format(statsDate);
 			do {
 				customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
 				if (!CollectionUtils.isEmpty(customerIdList)) {
 					for (String customerId : customerIdList) {
+						statsSummaryByCustomerId(dimIdBean, statsDateStr, customerId);
+					}
+				}
+			} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
+
+		return true;
+	}
+
+	private Date getStatsDateFromParam(StatsFormDTO formDTO) {
+		Date statsDate = null;
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) {
+			statsDate = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN);
+		} else {
+			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, -NumConstant.ONE), DateUtils.DATE_PATTERN);
+		}
+		return statsDate;
+	}
+
+	private void statsSummaryByCustomerId(DimIdGenerator.DimIdBean dimIdBean, String statsDateStr, String customerId) {
 		try {
 			//key:所在机关Id
 			Map<String, ArticleGridPublishedSummaryDTO> agencySummaryMap = new HashMap<>();
@@ -131,24 +152,21 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		} catch (Exception e) {
 			log.error("articlePublishedCountDayStats exception", e);
 		}
-
-				}
-			}
-		} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
-		return true;
 	}
 
 	@Override
-	public Boolean tagUsedDailyStatsjob(Date statsDate) {
+	public Boolean tagUsedDailyStatsjob(StatsFormDTO formDTO) {
+		Date statsDate = getStatsDateFromParam(formDTO);
 
-		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
-		if (statsDate == null) {
-			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN);
-		} else {
-			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		}
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			//统计
+			try {
+				statsTagUsedDaily(statsDate, dimIdBean, formDTO.getCustomerId());
+			} catch (Exception e) {
+				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e);
+			}
+		} else {
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
@@ -156,29 +174,31 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 				customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
 				if (!CollectionUtils.isEmpty(customerIdList)) {
 					for (String customerId : customerIdList) {
-					Date finalStatsDate = statsDate;
 						//统计
 						try {
-						statsTagUsedDaily(finalStatsDate, dimIdBean, customerId);
+							statsTagUsedDaily(statsDate, dimIdBean, customerId);
 						} catch (Exception e) {
 							log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedDailyStatsjob", customerId, dimIdBean.getDateId()), e);
 						}
 					}
 				}
 			} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
 		return true;
 	}
 
 	@Override
-	public Boolean tagUsedMonthlyStatsjob(Date statsDate) {
-		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
-		if (statsDate == null) {
-			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN);
-		} else {
-			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		}
+	public Boolean tagUsedMonthlyStatsjob(StatsFormDTO formDTO) {
+		Date statsDate = getStatsDateFromParam(formDTO);
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
+
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			try {
+				statsTagUsedMonthly(dimIdBean.getMonthId(), formDTO.getCustomerId());
+			} catch (Exception e) {
+				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getMonthId()), e);
+			}
+		} else {
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
@@ -194,20 +214,21 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					}
 				}
 			} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
 		return true;
 	}
 
 	@Override
-	public Boolean tagViewedDailyStatsjob(Date statsDate) {
-
-		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
-		if (statsDate == null) {
-			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN);
-		} else {
-			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		}
+	public Boolean tagViewedDailyStatsjob(StatsFormDTO formDTO) {
+		Date statsDate = getStatsDateFromParam(formDTO);
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			try {
+				statsTagViewedDaily(statsDate, dimIdBean, formDTO.getCustomerId());
+			} catch (Exception e) {
+				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getMonthId()), e);
+			}
+		} else {
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
@@ -223,19 +244,22 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					}
 				}
 			} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
+
 		return true;
 	}
 
 	@Override
-	public Boolean tagViewedMonthlyStatsjob(Date statsDate) {
-		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
-		if (statsDate == null) {
-			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN);
-		} else {
-			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		}
+	public Boolean tagViewedMonthlyStatsjob(StatsFormDTO formDTO) {
+		Date statsDate = getStatsDateFromParam(formDTO);
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			try {
+				statsTagViewedMonthly(dimIdBean.getMonthId(), formDTO.getCustomerId());
+			} catch (Exception e) {
+				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e);
+			}
+		} else {
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
@@ -251,19 +275,32 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					}
 				}
 			} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
 		return true;
 	}
 
 	@Override
-	public Boolean tagUsedQuarterlyStatsjob(Date statsDate) {
-		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
-		if (statsDate == null) {
-			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN);
-		} else {
-			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		}
+	public Boolean tagUsedQuarterlyStatsjob(StatsFormDTO formDTO) {
+		Date statsDate = getStatsDateFromParam(formDTO);
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			try {
+				try {
+					log.debug("start === statsTagUsedQuarterly ");
+					statsTagUsedQuarterly(dimIdBean.getQuarterId(), formDTO.getCustomerId());
+				} catch (Exception e) {
+					log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagUsedQuarterly", formDTO.getCustomerId(), dimIdBean.getQuarterId()), e);
+				}
+				try {
+					log.debug("start === statsTagUsedQuarterly ");
+					statsTagUsedYearly(dimIdBean.getYearId(), formDTO.getCustomerId());
+				} catch (Exception e) {
+					log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagUsedYearly", formDTO.getCustomerId(), dimIdBean.getYearId()), e);
+				}
+			} catch (Exception e) {
+				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e);
+			}
+		} else {
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
@@ -286,19 +323,28 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					}
 				}
 			} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
 		return true;
 	}
 
 	@Override
-	public Boolean tagViewedQuarterlyStatsjob(Date statsDate) {
-		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
-		if (statsDate == null) {
-			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN);
-		} else {
-			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-		}
+	public Boolean tagViewedQuarterlyStatsjob(StatsFormDTO formDTO) {
+		Date statsDate = getStatsDateFromParam(formDTO);
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
+		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			try {
+				log.debug("start === statsTagViewedQuarterly ");
+				statsTagViewedQuarterly(dimIdBean.getQuarterId(), formDTO.getCustomerId());
+			} catch (Exception e) {
+				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", formDTO.getCustomerId(), dimIdBean.getQuarterId()), e);
+			}
+			try {
+				log.debug("start === statsTagViewedYearly ");
+				statsTagViewedYearly(dimIdBean.getYearId(), formDTO.getCustomerId());
+			} catch (Exception e) {
+				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", formDTO.getCustomerId(), dimIdBean.getYearId()), e);
+			}
+		} else {
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
@@ -321,6 +367,8 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					}
 				}
 			} while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize);
+		}
+
 		return true;
 	}
 

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-job-server:
     container_name: epmet-job-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.15
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.16
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.15</version>
+    <version>0.3.16</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-job</artifactId>

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

@@ -13,11 +13,11 @@ public interface StatsProjectService {
      * @Description 数据统计-项目-机关日月统计
      * @Author sun
      */
-    Result agencyProjectStats();
+    Result agencyProjectStats(String params);
 
     /**
      * @Description 数据统计-项目-网格日月统计
      * @Author sun
      */
-    Result gridProjectStats();
+    Result gridProjectStats(String params);
 }

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

@@ -2,6 +2,7 @@ package com.epmet.service;
 
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 
 /**
  * desc:  数据-宣传能力-数据统计
@@ -18,7 +19,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result articleSummaryDailyStatsjob(String date);
+    Result articleSummaryDailyStatsjob(StatsFormDTO formDTO);
 
     /**
      * desc:  定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
@@ -27,7 +28,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagUsedDailyStatsjob(String date);
+    Result tagUsedDailyStatsjob(StatsFormDTO formDTO);
 
     /**
      * desc:  【月】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -35,7 +36,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagUsedMonthlyStatsjob(String date);
+    Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO);
 
     /**
      * desc:  【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -43,7 +44,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagUsedQuarterlyStatsjob(String date);
+    Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO);
 
     /**
      * desc:  【日】 统计阅读最多的标签 包含 机关 网格
@@ -51,7 +52,7 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagViewedDailyStatsjob(String date);
+    Result tagViewedDailyStatsjob(StatsFormDTO formDTO);
 
     /**
      * desc: 【月，季，年】 统计阅读最多的标签 包含 机关 网格
@@ -59,15 +60,14 @@ public interface StatsPublicityTaskService {
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
      */
-    Result tagViewedMonthlyStatsjob(String date);
+    Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO);
 
     /**
      * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格
      *
      * @date: 2020/6/22 9:09
      * @author: jianjun liu
-     * @param date
      */
-    Result tagViewedQuarterlyStatsjob(String date);
+    Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO);
 
 }

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

@@ -1,8 +1,9 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.service.StatsProjectService;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.service.StatsProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,8 +22,10 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Author sun
      */
     @Override
-    public Result agencyProjectStats() {
-        return statsPublicityFeignClient.agencyProjectStats();
+    public Result agencyProjectStats(String params) {
+        StatsFormDTO formDTO = new StatsFormDTO();
+        formDTO.setDate(params);
+        return statsPublicityFeignClient.agencyProjectStats(formDTO);
     }
 
     /**
@@ -30,7 +33,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      * @Author sun
      */
     @Override
-    public Result gridProjectStats() {
-        return statsPublicityFeignClient.gridProjectStats();
+    public Result gridProjectStats(String params) {
+        StatsFormDTO formDTO = new StatsFormDTO();
+        formDTO.setDate(params);
+        return statsPublicityFeignClient.gridProjectStats(formDTO);
     }
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.service.StatsPublicityTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +22,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result articleSummaryDailyStatsjob(String date) {
-        return dataStatsOpenFeignClient.articleSummaryDailyStatsjob(date);
+    public Result articleSummaryDailyStatsjob(StatsFormDTO formDTO) {
+        return dataStatsOpenFeignClient.articleSummaryDailyStatsjob(formDTO);
     }
 
     /**
@@ -33,8 +34,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedDailyStatsjob(String date) {
-        return dataStatsOpenFeignClient.tagUsedDailyStatsjob(date);
+    public Result tagUsedDailyStatsjob(StatsFormDTO formDTO) {
+        return dataStatsOpenFeignClient.tagUsedDailyStatsjob(formDTO);
     }
 
     /**
@@ -44,8 +45,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedMonthlyStatsjob(String date) {
-        return dataStatsOpenFeignClient.tagUsedMonthlyStatsjob(date);
+    public Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO) {
+        return dataStatsOpenFeignClient.tagUsedMonthlyStatsjob(formDTO);
     }
 
     /**
@@ -55,8 +56,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagUsedQuarterlyStatsjob(String date) {
-        return dataStatsOpenFeignClient.tagUsedQuarterlyStatsjob(date);
+    public Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO) {
+        return dataStatsOpenFeignClient.tagUsedQuarterlyStatsjob(formDTO);
     }
 
     /**
@@ -66,8 +67,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedDailyStatsjob(String date) {
-        return dataStatsOpenFeignClient.tagViewedDailyStatsjob(date);
+    public Result tagViewedDailyStatsjob(StatsFormDTO formDTO) {
+        return dataStatsOpenFeignClient.tagViewedDailyStatsjob(formDTO);
     }
 
     /**
@@ -77,8 +78,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @author: jianjun liu
      */
     @Override
-    public Result tagViewedMonthlyStatsjob(String date) {
-        return dataStatsOpenFeignClient.tagViewedMonthlyStatsjob(date);
+    public Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO) {
+        return dataStatsOpenFeignClient.tagViewedMonthlyStatsjob(formDTO);
     }
 
     /**
@@ -89,7 +90,7 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService
      * @param date
      */
     @Override
-    public Result tagViewedQuarterlyStatsjob(String date) {
-        return dataStatsOpenFeignClient.tagViewedQuarterlyStatsjob(date);
+    public Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO) {
+        return dataStatsOpenFeignClient.tagViewedQuarterlyStatsjob(formDTO);
     }
 }

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

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,11 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(params);
+		StatsFormDTO formDTO = null;
+		if (StringUtils.isNotBlank(params)){
+			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+		}
+		Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(formDTO);
 		if (result.success()) {
 			logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行定时任务执行成功");
 		} else {

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

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,11 @@ public class PublicityTagUsedDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagUsedDailyStatsjob(params);
+		StatsFormDTO formDTO = null;
+		if (StringUtils.isNotBlank(params)){
+			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+		}
+		Result result = statsPublicityTaskService.tagUsedDailyStatsjob(formDTO);
 		if (result.success()) {
 			logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行定时任务执行成功");
 		} else {

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

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,11 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(params);
+		StatsFormDTO formDTO = null;
+		if (StringUtils.isNotBlank(params)){
+			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+		}
+		Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(formDTO);
 		if (result.success()) {
 			logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功");
 		} else {

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

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,11 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(params);
+		StatsFormDTO formDTO = null;
+		if (StringUtils.isNotBlank(params)){
+			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+		}
+		Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(formDTO);
 		if (result.success()) {
 			logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功");
 		} else {

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

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,11 @@ public class PublicityTagViewedDailyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagViewedDailyStatsjob(params);
+		StatsFormDTO formDTO = null;
+		if (StringUtils.isNotBlank(params)){
+			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+		}
+		Result result = statsPublicityTaskService.tagViewedDailyStatsjob(formDTO);
 		if (result.success()) {
 			logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行定时任务执行成功");
 		} else {

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

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,11 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(params);
+		StatsFormDTO formDTO = null;
+		if (StringUtils.isNotBlank(params)){
+			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+		}
+		Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(formDTO);
 		if (result.success()) {
 			logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功");
 		} else {

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

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +24,11 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask {
 	@Override
 	public void run(String params) {
 		logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params);
-		Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(params);
+		StatsFormDTO formDTO = null;
+		if (StringUtils.isNotBlank(params)){
+			formDTO = ConvertUtils.sourceToTarget(params, StatsFormDTO.class);
+		}
+		Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(formDTO);
 		if (result.success()) {
 			logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功");
 		} else {

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

@@ -22,7 +22,7 @@ public class StatsProjectAgencyTask implements ITask {
     @Override
     public void run(String params) {
         log.debug("StatsProjectAgencyTask定时任务正在执行，参数为：{}", params);
-        Result result = statsProjectService.agencyProjectStats();
+        Result result = statsProjectService.agencyProjectStats(params);
         if (result.success()){
             log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行成功");
         }else {

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

@@ -25,7 +25,7 @@ public class StatsProjectGridTask implements ITask {
     @Override
     public void run(String params) {
         log.debug("StatsProjectGridTask定时任务正在执行，参数为：{}", params);
-        Result result = statsProjectService.gridProjectStats();
+        Result result = statsProjectService.gridProjectStats(params);
         if (result.success()){
             log.debug("StatsProjectGridTask定时任务正在执行定时任务执行成功");
         }else {