From ec4d59de0a7e5baa6be4f1bc021b8b80740a408e Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 2 Jul 2020 08:55:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/StatsGroupController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java index 18ccdfe3ab..18e52be77a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java +++ b/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(); } } From c607167bd759bfbaa00c9e1534ccd4eb2df5782a Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 09:17:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/DataStatisticalOpenFeignClient.java | 14 +++++++------- .../epmet/controller/StatsPublicityController.java | 5 +++++ .../service/impl/StatsPublicityServiceImpl.java | 4 ++++ 3 files changed, 16 insertions(+), 7 deletions(-) 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 9953e2d3c1..1f1c1b10fe 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 @@ -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：【网格-日】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java index eb01c07d69..d979c9d3eb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsPublicityController.java +++ b/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 articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("articleSummaryDailyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.articleSummaryDailyStatsjob(formDTO)); } @@ -43,6 +47,7 @@ public class StatsPublicityController { */ @PostMapping(value = "tagUsedDailyStatsjob") public Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + log.debug("tagUsedDailyStatsjob param:{}", JSON.toJSONString(formDTO)); return new Result().ok(statsPublicityService.tagUsedDailyStatsjob(formDTO)); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index 3c38d751f3..9a22e7a74f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/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 excute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsSummaryByCustomerId(dimIdBean, statsDateStr, formDTO.getCustomerId()); } else { + log.info("articleSummaryDailyStatsjob excute all customer,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; @@ -162,11 +164,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { //统计 try { + log.debug("tagUsedDailyStatsjob excute 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.debug("tagUsedDailyStatsjob excute all customerId,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; From 7ff5552a65f60d96319a986b1ac1d024ae2ece2f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 2 Jul 2020 09:20:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/StatsPublicityServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index 9a22e7a74f..23b75b1cbf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -114,10 +114,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 //入参有客户Id的则按客户Id执行，没有的则全部客户都执行 if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { - log.info("articleSummaryDailyStatsjob excute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); + log.info("articleSummaryDailyStatsjob execute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); statsSummaryByCustomerId(dimIdBean, statsDateStr, formDTO.getCustomerId()); } else { - log.info("articleSummaryDailyStatsjob excute all customer,dateId:{}", dimIdBean.getDateId()); + log.info("articleSummaryDailyStatsjob execute all customer,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null; @@ -164,13 +164,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) { //统计 try { - log.debug("tagUsedDailyStatsjob excute by customerId:{},dateId:{}", formDTO.getCustomerId(), dimIdBean.getDateId()); + 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.debug("tagUsedDailyStatsjob excute all customerId,dateId:{}", dimIdBean.getDateId()); + log.info("tagUsedDailyStatsjob execute all customerId,dateId:{}", dimIdBean.getDateId()); int pageNo = NumConstant.ONE; int pageSize = NumConstant.ONE_HUNDRED; List customerIdList = null;