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

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

@@ -29,7 +29,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob")
- Result articleSummaryDailyStatsjob(StatsFormDTO formDTO);
+ Result articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
 
  /**
   * desc:  定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格
@@ -39,7 +39,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob")
- Result tagUsedDailyStatsjob(StatsFormDTO formDTO);
+ Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
 
  /**
   * desc:  【月】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -48,7 +48,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob")
- Result tagUsedMonthlyStatsjob(StatsFormDTO formDTO);
+ Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
 
  /**
   * desc:  【季，年】 统计发表文章最多的分类 包含 机关 部门 网格
@@ -57,7 +57,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob")
- Result tagUsedQuarterlyStatsjob(StatsFormDTO formDTO);
+ Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
 
  /**
   * desc:  【日】 统计阅读最多的标签 包含 机关 网格
@@ -66,7 +66,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob")
- Result tagViewedDailyStatsjob(StatsFormDTO formDTO);
+ Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
 
  /**
   * desc: 【月】 统计阅读最多的标签 包含 机关 网格
@@ -75,7 +75,7 @@ public interface DataStatisticalOpenFeignClient {
   * @author: jianjun liu
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob")
- Result tagViewedMonthlyStatsjob(StatsFormDTO formDTO);
+ Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
 
  /**
   * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格
@@ -85,7 +85,7 @@ public interface DataStatisticalOpenFeignClient {
   * @param date
   */
  @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob")
- Result tagViewedQuarterlyStatsjob(StatsFormDTO formDTO);
+ Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO);
 
  /**
   * @Description  统计 “网格小组”， dim：【网格-日】

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

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.service.StatsGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +31,9 @@ public class StatsGroupController {
      * @author zxc
      */
     @PostMapping("groupgriddaily")
-    public void groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){
+    public Result groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){
         statsGroupService.groupGridDaily(formDTO);
+        return new Result();
     }
 
     /**
@@ -40,8 +42,9 @@ public class StatsGroupController {
      * @author zxc
      */
     @PostMapping("groupagencydaily")
-    public void groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){
+    public Result groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){
         statsGroupService.groupAgencyDaily(formDTO);
+        return new Result();
     }
 
     /**
@@ -50,8 +53,9 @@ public class StatsGroupController {
      * @author zxc
      */
     @PostMapping("groupagencymonthly")
-    public void groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){
+    public Result groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){
         statsGroupService.groupAgencyMonthly(formDTO);
+        return new Result();
     }
 
 }

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

@@ -1,8 +1,10 @@
 package com.epmet.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.service.StatsPublicityService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,6 +16,7 @@ import java.util.concurrent.ExecutorService;
 /**
  * desc:宣传能力controller
  */
+@Slf4j
 @RequestMapping("statspublicity")
 @RestController
 public class StatsPublicityController {
@@ -32,6 +35,7 @@ public class StatsPublicityController {
 	 */
 	@PostMapping(value = "articleSummaryDailyStatsjob")
 	public Result<Boolean> articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		log.debug("articleSummaryDailyStatsjob param:{}", JSON.toJSONString(formDTO));
 		return new Result<Boolean>().ok(statsPublicityService.articleSummaryDailyStatsjob(formDTO));
 	}
 
@@ -43,6 +47,7 @@ public class StatsPublicityController {
 	 */
 	@PostMapping(value = "tagUsedDailyStatsjob")
 	public Result<Boolean> tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) {
+		log.debug("tagUsedDailyStatsjob param:{}", JSON.toJSONString(formDTO));
 		return new Result<Boolean>().ok(statsPublicityService.tagUsedDailyStatsjob(formDTO));
 	}
 

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

@@ -114,8 +114,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
 		//入参有客户Id的则按客户Id执行，没有的则全部客户都执行
 		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
+			log.info("articleSummaryDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
 			statsSummaryByCustomerId(dimIdBean, statsDateStr, formDTO.getCustomerId());
 		} else {
+			log.info("articleSummaryDailyStatsjob execute all customer,dateId:{}", dimIdBean.getDateId());
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;
@@ -162,11 +164,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
 			//统计
 			try {
+				log.info("tagUsedDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId());
 				statsTagUsedDaily(statsDate, dimIdBean, formDTO.getCustomerId());
 			} catch (Exception e) {
 				log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedDailyStatsjob", formDTO.getCustomerId(), dimIdBean.getDateId()), e);
 			}
 		} else {
+			log.info("tagUsedDailyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId());
 			int pageNo = NumConstant.ONE;
 			int pageSize = NumConstant.ONE_HUNDRED;
 			List<String> customerIdList = null;