From dc81207333c080664cf8151d09e705e7076361cf Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Wed, 1 Jul 2020 17:12:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/StatsGroupServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index c5da9d5a34..091ea2fbb5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/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(); From 20f0508518c83f5063b91a9a67b45d65e362273c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 1 Jul 2020 17:42:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ProjectStatsFormDTO.java => StatsFormDTO.java} | 10 +++++----- .../feign/DataStatisticalOpenFeignClient.java | 5 +++-- .../DataStatisticalOpenFeignClientFallBack.java | 9 +++++---- .../epmet/controller/StatsProjectController.java | 6 +++--- .../com/epmet/service/StatsProjectService.java | 6 +++--- .../service/impl/StatsProjectServiceImpl.java | 12 ++++++------ .../com/epmet/service/StatsProjectService.java | 4 ++-- .../service/impl/StatsProjectServiceImpl.java | 15 ++++++++++----- .../com/epmet/task/StatsProjectAgencyTask.java | 2 +- .../java/com/epmet/task/StatsProjectGridTask.java | 2 +- 10 files changed, 39 insertions(+), 32 deletions(-) rename epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/{project/form/ProjectStatsFormDTO.java => StatsFormDTO.java} (54%) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/ProjectStatsFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/StatsFormDTO.java similarity index 54% rename from epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/ProjectStatsFormDTO.java rename to epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/StatsFormDTO.java index a5958ce39f..71bc0be27a 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/ProjectStatsFormDTO.java +++ b/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 = ""; } 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 f1f0e705d7..996d8b48bf 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 @@ -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; @@ -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); /** * 初始化所有维度 diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java index 79186a8277..e871ada6e1 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -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; @@ -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 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java index 425c408cd8..b913dfdd0a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java +++ b/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(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java index b9a9b1274f..1c242b2048 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java +++ b/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); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 75d195285c..16dac34981 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/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,7 +367,7 @@ 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())) { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsProjectService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsProjectService.java index 473f8c798b..52eea39ad9 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsProjectService.java +++ b/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); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 0fb06aa23c..eab8e78871 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/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); } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java index fcb09dae46..f257476159 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java +++ b/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 { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java index 293aa82380..8d858bdde0 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java +++ b/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 { From 1c7367486e974ba4135d5234dbeb6b14aa4366fe Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 1 Jul 2020 17:48:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=BC=8F=E6=8F=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StatsProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 16dac34981..c5263c243b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -370,11 +370,11 @@ public class StatsProjectServiceImpl implements StatsProjectService { 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 { From 83afb0e64e6a024be19997504f150ccca82557d4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 18:11:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/filter/LogMsgSendFilter.java | 3 + .../epmet/commons/tools/utils/IpUtils.java | 35 +- .../feign/DataStatisticalOpenFeignClient.java | 14 +- ...ataStatisticalOpenFeignClientFallBack.java | 30 +- .../controller/StatsPublicityController.java | 45 +-- .../epmet/service/StatsPublicityService.java | 19 +- .../impl/StatsPublicityServiceImpl.java | 372 ++++++++++-------- 7 files changed, 305 insertions(+), 213 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index 4f24fa70d2..4bdce1f3e0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/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()); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java index 6ce41b048f..bde12725d9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IpUtils.java +++ b/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工具类 @@ -23,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; public class IpUtils { private static Logger logger = LoggerFactory.getLogger(IpUtils.class); - public static String getIpAddr(HttpServletRequest request) { + public static String getIpAddr(HttpServletRequest request) { String ip = null; try { ip = request.getHeader("x-forwarded-for"); @@ -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; + } } 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 996d8b48bf..9953e2d3c1 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(@RequestParam(value = "date",required = false) String date); + Result articleSummaryDailyStatsjob(StatsFormDTO formDTO); /** * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 @@ -39,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: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -48,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: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -57,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: 【日】 统计阅读最多的标签 包含 机关 网格 @@ -66,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: 【月】 统计阅读最多的标签 包含 机关 网格 @@ -75,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: 【季，年】 统计阅读最多的标签 包含 机关 网格 @@ -85,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：【网格-日】 diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java index e871ada6e1..d58fa69ec4 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -27,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); } /** @@ -39,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); } /** @@ -50,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); } /** @@ -61,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); } /** @@ -72,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); } /** @@ -83,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); } /** @@ -92,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 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 79ca1d0acf..eb01c07d69 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,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 articleSummaryDailyStatsjob(Date statsDate) { - return new Result().ok(statsPublicityService.articleSummaryDailyStatsjob(statsDate)); + public Result articleSummaryDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + return new Result().ok(statsPublicityService.articleSummaryDailyStatsjob(formDTO)); } /** * desc:【日】 统计发表文章最多的分类 包含 机关 部门 网格 * - * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据 + * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return */ @PostMapping(value = "tagUsedDailyStatsjob") - public Result tagUsedDailyStatsjob(Date statsDate) { - return new Result().ok(statsPublicityService.tagUsedDailyStatsjob(statsDate)); + public Result tagUsedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + return new Result().ok(statsPublicityService.tagUsedDailyStatsjob(formDTO)); } /** * desc:【月,季，年】 统计发表文章最多的分类 包含 机关 部门 网格 * - * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据 + * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return */ @PostMapping(value = "tagUsedMonthlyStatsjob") - public Result tagUsedMonthlyStatsjob(Date statsDate) { - return new Result().ok(statsPublicityService.tagUsedMonthlyStatsjob(statsDate)); + public Result tagUsedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + return new Result().ok(statsPublicityService.tagUsedMonthlyStatsjob(formDTO)); } /** * desc:【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 * - * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据 + * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return */ @PostMapping(value = "tagUsedQuarterlyStatsjob") - public Result tagUsedQuarterlyStatsjob(Date statsDate) { - return new Result().ok(statsPublicityService.tagUsedQuarterlyStatsjob(statsDate)); + public Result tagUsedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + return new Result().ok(statsPublicityService.tagUsedQuarterlyStatsjob(formDTO)); } /** * desc:【日】 统计阅读最多的标签 包含 机关 网格 * - * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据 + * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return */ @PostMapping(value = "tagViewedDailyStatsjob") - public Result tagViewedDailyStatsjob(Date statsDate) { - return new Result().ok(statsPublicityService.tagViewedDailyStatsjob(statsDate)); + public Result tagViewedDailyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + return new Result().ok(statsPublicityService.tagViewedDailyStatsjob(formDTO)); } /** * desc:【月】 统计阅读最多的标签 包含 机关 网格 * - * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据 + * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return */ @PostMapping(value = "tagViewedMonthlyStatsjob") - public Result tagViewedMonthlyStatsjob(Date statsDate) { - return new Result().ok(statsPublicityService.tagViewedMonthlyStatsjob(statsDate)); + public Result tagViewedMonthlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + return new Result().ok(statsPublicityService.tagViewedMonthlyStatsjob(formDTO)); } /** * desc:【季，年】 统计阅读最多的标签 包含 机关 网格 * - * @param statsDate 默认：为T-1天，如果传 则统计的是【statsDate】的数据 + * @param formDTO 默认：为T-1天，如果传 则统计的是【formDTO】的数据 * @return */ @PostMapping(value = "tagViewedQuarterlyStatsjob") - public Result tagViewedQuarterlyStatsjob(Date statsDate) { - return new Result().ok(statsPublicityService.tagViewedQuarterlyStatsjob(statsDate)); + public Result tagViewedQuarterlyStatsjob(@RequestBody(required = false) StatsFormDTO formDTO) { + return new Result().ok(statsPublicityService.tagViewedQuarterlyStatsjob(formDTO)); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java index 772d48e788..14a165b830 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java +++ b/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); } 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 6098238d0b..051c7add67 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 @@ -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,80 +107,100 @@ 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 customerIdList = null; - String statsDateStr = DateUtils.format(statsDate); - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - //key:所在机关Id - Map agencySummaryMap = new HashMap<>(); - statsPublishedGridDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); - statsPublishedDepartmentDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); - statsPublishedAgencyDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); - } catch (Exception e) { - log.error("articlePublishedCountDayStats exception", e); + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_HUNDRED; + List customerIdList = null; + 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); + } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } + return true; } - @Override - public Boolean tagUsedDailyStatsjob(Date statsDate) { + private Date getStatsDateFromParam(StatsFormDTO formDTO) { + Date statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, -NumConstant.ONE), DateUtils.DATE_PATTERN); + if (null != formDTO && StringUtils.isNotBlank(formDTO.getDate())) { + statsDate = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN); + } + return statsDate; + } - //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 - if (statsDate == null) { - //当天的凌晨时间 即为今天之前的数据 - statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN); - } else { - statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); + private void statsSummaryByCustomerId(DimIdGenerator.DimIdBean dimIdBean, String statsDateStr, String customerId) { + try { + //key:所在机关Id + Map agencySummaryMap = new HashMap<>(); + statsPublishedGridDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); + statsPublishedDepartmentDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); + statsPublishedAgencyDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); + } catch (Exception e) { + log.error("articlePublishedCountDayStats exception", e); } + } + + @Override + public Boolean tagUsedDailyStatsjob(StatsFormDTO formDTO) { + Date statsDate = getStatsDateFromParam(formDTO); + DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); - int pageNo = NumConstant.ONE; - int pageSize = NumConstant.ONE_HUNDRED; - List customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - Date finalStatsDate = statsDate; - //统计 - try { - statsTagUsedDaily(finalStatsDate, dimIdBean, customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedDailyStatsjob", customerId, dimIdBean.getDateId()), e); + 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 customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + //统计 + try { + 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); + } 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 customerIdList = null; @@ -194,133 +216,163 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { } } } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); - return true; } + return true; +} @Override - public Boolean tagViewedDailyStatsjob(Date statsDate) { + public Boolean tagViewedDailyStatsjob(StatsFormDTO formDTO) { - //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 - if (statsDate == null) { - //当天的凌晨时间 即为今天之前的数据 - statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -NumConstant.ONE), DateUtils.DATE_PATTERN); - } else { - statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); - } + Date statsDate = getStatsDateFromParam(formDTO); DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); - int pageNo = NumConstant.ONE; - int pageSize = NumConstant.ONE_HUNDRED; - List customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - statsTagViewedDaily(statsDate, dimIdBean, customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedDailyStatsjob", customerId, dimIdBean.getDateId()), e); + 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", customerId, dimIdBean.getMonthId()), e); + } + + } else { + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_HUNDRED; + List customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + statsTagViewedDaily(statsDate, dimIdBean, customerId); + } catch (Exception e) { + log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedDailyStatsjob", customerId, dimIdBean.getDateId()), e); + } } } - } - } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } 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); - int pageNo = NumConstant.ONE; - int pageSize = NumConstant.ONE_HUNDRED; - List customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - statsTagViewedMonthly(dimIdBean.getMonthId(), customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", customerId, dimIdBean.getDateId()), e); + 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 customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + statsTagViewedMonthly(dimIdBean.getMonthId(), customerId); + } catch (Exception e) { + log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagViewedMonthlyStatsjob", customerId, dimIdBean.getDateId()), e); + } } } - } - } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } 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); - int pageNo = NumConstant.ONE; - int pageSize = NumConstant.ONE_HUNDRED; - List customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - log.debug("start === statsTagUsedQuarterly "); - statsTagUsedQuarterly(dimIdBean.getQuarterId(), customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagUsedQuarterly", customerId, dimIdBean.getQuarterId()), e); - } - try { - log.debug("start === statsTagUsedQuarterly "); - statsTagUsedYearly(dimIdBean.getYearId(), customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagUsedYearly", customerId, dimIdBean.getYearId()), e); - } + 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); } - } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } else { + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_HUNDRED; + List customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + log.debug("start === statsTagUsedQuarterly "); + statsTagUsedQuarterly(dimIdBean.getQuarterId(), customerId); + } catch (Exception e) { + log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagUsedQuarterly", customerId, dimIdBean.getQuarterId()), e); + } + try { + log.debug("start === statsTagUsedQuarterly "); + statsTagUsedYearly(dimIdBean.getYearId(), customerId); + } catch (Exception e) { + log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagUsedYearly", customerId, dimIdBean.getYearId()), e); + } + } + } + } 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); - int pageNo = NumConstant.ONE; - int pageSize = NumConstant.ONE_HUNDRED; - List customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - log.debug("start === statsTagViewedQuarterly "); - statsTagViewedQuarterly(dimIdBean.getQuarterId(), customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", customerId, dimIdBean.getQuarterId()), e); - } - try { - log.debug("start === statsTagViewedYearly "); - statsTagViewedYearly(dimIdBean.getYearId(), customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", customerId, dimIdBean.getYearId()), e); + 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 customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + log.debug("start === statsTagViewedQuarterly "); + statsTagViewedQuarterly(dimIdBean.getQuarterId(), customerId); + } catch (Exception e) { + log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", customerId, dimIdBean.getQuarterId()), e); + } + try { + log.debug("start === statsTagViewedYearly "); + statsTagViewedYearly(dimIdBean.getYearId(), customerId); + } catch (Exception e) { + log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "statsTagViewedQuarterly", customerId, dimIdBean.getYearId()), e); + } } } - } - } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } + return true; } @@ -870,13 +922,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { */ private void statsTagViewedQuarterly(String quarterId, String customerId) { List gridMonthlyList = factTagViewedGridMonthlyService.getTagViewedCountByQuarterId(customerId, quarterId); - log.debug("statsTagViewedQuarterly grid quarterId:{},customerId:{},result:{}",quarterId,customerId,JSON.toJSONString(gridMonthlyList)); + log.debug("statsTagViewedQuarterly grid quarterId:{},customerId:{},result:{}", quarterId, customerId, JSON.toJSONString(gridMonthlyList)); if (!CollectionUtils.isEmpty(gridMonthlyList)) { List gridQuarterlyList = ConvertUtils.sourceToTarget(gridMonthlyList, FactTagViewedGridQuarterlyEntity.class); factTagViewedGridQuarterlyService.deleteAndInsertByQuarterId(customerId, quarterId, gridQuarterlyList); } List agencyMonthlyList = factTagViewedAgencyMonthlyService.getTagViewedCountByQuarterId(customerId, quarterId); - log.debug("statsTagViewedQuarterly agency quarterId:{},customerId:{},result:{}",quarterId,customerId,JSON.toJSONString(gridMonthlyList)); + log.debug("statsTagViewedQuarterly agency quarterId:{},customerId:{},result:{}", quarterId, customerId, JSON.toJSONString(gridMonthlyList)); if (!CollectionUtils.isEmpty(agencyMonthlyList)) { List agencyQuarterlyList = ConvertUtils.sourceToTarget(agencyMonthlyList, FactTagViewedAgencyQuarterlyEntity.class); factTagViewedAgencyQuarterlyService.deleteAndInsertByQuarterId(customerId, quarterId, agencyQuarterlyList); @@ -915,13 +967,13 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { */ private void statsTagViewedYearly(String yearId, String customerId) { List gridMonthlyList = factTagViewedGridMonthlyService.getTagViewedCountByYearId(customerId, yearId); - log.debug("statsTagViewedYearly grid yearId:{},customerId:{},result:{}",yearId,customerId,JSON.toJSONString(gridMonthlyList)); + log.debug("statsTagViewedYearly grid yearId:{},customerId:{},result:{}", yearId, customerId, JSON.toJSONString(gridMonthlyList)); if (!CollectionUtils.isEmpty(gridMonthlyList)) { List gridYearlyList = ConvertUtils.sourceToTarget(gridMonthlyList, FactTagViewedGridYearlyEntity.class); factTagViewedGridYearlyService.deleteAndInsertByYearId(customerId, yearId, gridYearlyList); } List agencyMonthlyList = factTagViewedAgencyMonthlyService.getTagViewedCountByYearId(customerId, yearId); - log.debug("statsTagViewedYearly agency yearId:{},customerId:{},result:{}",yearId,customerId,JSON.toJSONString(agencyMonthlyList)); + log.debug("statsTagViewedYearly agency yearId:{},customerId:{},result:{}", yearId, customerId, JSON.toJSONString(agencyMonthlyList)); if (!CollectionUtils.isEmpty(agencyMonthlyList)) { List agencyYearlyList = ConvertUtils.sourceToTarget(agencyMonthlyList, FactTagViewedAgencyYearlyEntity.class); factTagViewedAgencyYearlyService.deleteAndInsertByYearId(customerId, yearId, agencyYearlyList); From 33705adfb0e68a1c24fda3eb4bdfc307b29f619e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 18:44:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StatsPublicityServiceImpl.java | 46 +++++++++---------- .../service/StatsPublicityTaskService.java | 16 +++---- .../impl/StatsPublicityTaskServiceImpl.java | 29 ++++++------ ...PublicityArticleSummaryDailyStatsTask.java | 9 +++- .../task/PublicityTagUsedDailyStatsTask.java | 9 +++- .../PublicityTagUsedMonthlyStatsTask.java | 9 +++- ...ityTagUsedQuarterlyAndYearlyStatsTask.java | 9 +++- .../PublicityTagViewedDailyStatsTask.java | 9 +++- .../PublicityTagViewedMonthlyStatsTask.java | 9 +++- ...gViewedQuarterlyAndYearlyhlyStatsTask.java | 9 +++- 10 files changed, 100 insertions(+), 54 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 051c7add67..3c38d751f3 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 @@ -133,9 +133,11 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { } private Date getStatsDateFromParam(StatsFormDTO formDTO) { - Date statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, -NumConstant.ONE), DateUtils.DATE_PATTERN); + 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; } @@ -191,47 +193,41 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { 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 customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - statsTagUsedMonthly(dimIdBean.getMonthId(), customerId); - } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedMonthlyStatsjob", customerId, dimIdBean.getMonthId()), e); + } else { + int pageNo = NumConstant.ONE; + int pageSize = NumConstant.ONE_HUNDRED; + List customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + statsTagUsedMonthly(dimIdBean.getMonthId(), customerId); + } catch (Exception e) { + log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedMonthlyStatsjob", customerId, dimIdBean.getMonthId()), e); + } } } - } - } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); - } + } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } return true; -} + } @Override public Boolean tagViewedDailyStatsjob(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()); + statsTagViewedDaily(statsDate, dimIdBean, formDTO.getCustomerId()); } catch (Exception e) { - log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "tagUsedMonthlyStatsjob", customerId, dimIdBean.getMonthId()), 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; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java index d297147454..2b1c2df325 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsPublicityTaskService.java +++ b/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); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java index 1cd14a482a..1b7e637a57 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java +++ b/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); } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java index 1738a07692..c3ee22aedc 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityArticleSummaryDailyStatsTask.java +++ b/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 { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java index 318dff6fb2..7c007bb700 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java +++ b/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 { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java index c87deeb616..948790c4bb 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java +++ b/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 { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java index 1f13b6a817..afc02304e6 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java +++ b/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 { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java index 4bbb4b318d..899386fc35 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedDailyStatsTask.java +++ b/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 { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java index e2b01fe868..bc16c6b497 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedMonthlyStatsTask.java +++ b/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 { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java index afae0d7367..105f3ad987 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java +++ b/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 { From 7c2ce7222d58c38b0a6b0f8736c0f0b5a43a599e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 1 Jul 2020 18:47:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=83=A8=E7=BD=B2stats=20job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index af64999a9f..eaf79bb7f7 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 75513a4b49..1eb56141a2 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.28 + 0.3.29 data-statistical com.epmet diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 7608b40411..422c0430cc 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index cdbdd6767d..133a121bd9 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.15 + 0.3.16 com.epmet epmet-job