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 {