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/project/form/ProjectStatsFormDTO.java new file mode 100644 index 0000000000..a5958ce39f --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/ProjectStatsFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.project.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author sun + * 项目数据统计接口入参（方便后期可以手动调用） + */ +@Data +public class ProjectStatsFormDTO implements Serializable { + + private static final long serialVersionUID = -3634745091993094743L; + + /** + * 客户Id + */ + private String customerId; + /** + * 需要执行的日期（格式：yyyy-MM-dd）2020-01-01 + */ + 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 3e697227fe..095ec83bbd 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 @@ -9,8 +9,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import java.util.Date; - /** * desc: 数据统计 对外feign client * @@ -29,7 +27,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob") - Result articleSummaryDailyStatsjob(); + Result articleSummaryDailyStatsjob(@RequestParam(value = "date",required = false) String date); /** * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 @@ -39,7 +37,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob") - Result tagUsedDailyStatsjob(); + Result tagUsedDailyStatsjob(@RequestParam(value = "date",required = false) String date); /** * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -48,7 +46,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob") - Result tagUsedMonthlyStatsjob(); + Result tagUsedMonthlyStatsjob(@RequestParam(value = "date",required = false) String date); /** * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -57,7 +55,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob") - Result tagUsedQuarterlyStatsjob(); + Result tagUsedQuarterlyStatsjob(@RequestParam(value = "date",required = false) String date); /** * desc: 【日】 统计阅读最多的标签 包含 机关 网格 @@ -66,7 +64,7 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob") - Result tagViewedDailyStatsjob(); + Result tagViewedDailyStatsjob(@RequestParam(value = "date",required = false) String date); /** * desc: 【月】 统计阅读最多的标签 包含 机关 网格 @@ -75,16 +73,17 @@ public interface DataStatisticalOpenFeignClient { * @author: jianjun liu */ @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob") - Result tagViewedMonthlyStatsjob(); + Result tagViewedMonthlyStatsjob(@RequestParam(value = "date",required = false) String date); /** * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 * * @date: 2020/6/22 9:09 * @author: jianjun liu + * @param date */ @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob") - Result tagViewedQuarterlyStatsjob(); + Result tagViewedQuarterlyStatsjob(@RequestParam(value = "date",required = false) String date); /** * @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 a731ebb8de..93d1ffa433 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 @@ -7,9 +7,6 @@ import com.epmet.dto.issue.form.IssueJobFromDTO; import com.epmet.feign.DataStatisticalOpenFeignClient; import org.springframework.stereotype.Component; - -import java.util.Date; - /** * desc: * @@ -28,7 +25,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp * @author: jianjun liu */ @Override - public Result articleSummaryDailyStatsjob() { + public Result articleSummaryDailyStatsjob(String date) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "articleSummaryDailyStatsjob"); } @@ -40,7 +37,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp * @author: jianjun liu */ @Override - public Result tagUsedDailyStatsjob() { + public Result tagUsedDailyStatsjob(String date) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedDailyStatsjob"); } @@ -51,7 +48,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp * @author: jianjun liu */ @Override - public Result tagUsedMonthlyStatsjob() { + public Result tagUsedMonthlyStatsjob(String date) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedMonthlyStatsjob"); } @@ -62,7 +59,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp * @author: jianjun liu */ @Override - public Result tagUsedQuarterlyStatsjob() { + public Result tagUsedQuarterlyStatsjob(String date) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagUsedQuarterlyStatsjob"); } @@ -73,7 +70,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp * @author: jianjun liu */ @Override - public Result tagViewedDailyStatsjob() { + public Result tagViewedDailyStatsjob(String date) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedDailyStatsjob"); } @@ -84,7 +81,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp * @author: jianjun liu */ @Override - public Result tagViewedMonthlyStatsjob() { + public Result tagViewedMonthlyStatsjob(String date) { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedMonthlyStatsjob"); } @@ -93,10 +90,11 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp * * @date: 2020/6/22 9:09 * @author: jianjun liu + * @param date */ @Override - public Result tagViewedQuarterlyStatsjob() { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedQuarterlyStatsjob"); + public Result tagViewedQuarterlyStatsjob(String date) { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "tagViewedQuarterlyStatsjob",date); } @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 0b1bd0eb47..425c408cd8 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,9 +1,11 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.project.form.ProjectStatsFormDTO; import com.epmet.service.StatsProjectService; 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; @@ -23,8 +25,8 @@ public class StatsProjectController { * @Description 数据-项目-机关日(月)统计 **/ @PostMapping("agencyprojectstats") - public Result agencyProjectStats() { - statsProjectService.agencyProjectStats(); + public Result agencyProjectStats(@RequestBody ProjectStatsFormDTO formDTO) { + statsProjectService.agencyProjectStats(formDTO); return new Result(); } @@ -33,8 +35,8 @@ public class StatsProjectController { * @Description 数据-项目-网格日(月)统计 **/ @PostMapping("gridprojectstats") - public Result gridProjectStats() { - statsProjectService.gridProjectStats(); + public Result gridProjectStats(@RequestBody ProjectStatsFormDTO formDTO) { + statsProjectService.gridProjectStats(formDTO); return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java index 1757166dba..25cd62b30a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java @@ -27,42 +27,22 @@ public class IssueServiceImpl implements IssueService { @Override public List getAgencyIssueTotal(String customerId, String date) { - List list = statsIssueDao.selectAgencyIssueTotal(customerId, date); - list.forEach(dto -> { - String[] pIds = dto.getPIds().split(":"); - dto.setPId(pIds[pIds.length - 2]); - }); - return list; + return statsIssueDao.selectAgencyIssueTotal(customerId, date); } @Override public List getAgencyIssueInc(String customerId, String date) { - List list = statsIssueDao.selectAgencyIssueInc(customerId, date); - list.forEach(dto -> { - String[] pIds = dto.getPIds().split(":"); - dto.setPId(pIds[pIds.length - 2]); - }); - return list; + return statsIssueDao.selectAgencyIssueInc(customerId, date); } @Override public List getAgencyClosedIssueTotal(String customerId, String date) { - List list = statsIssueDao.selectAgencyClosedIssueTotal(customerId, date); - list.forEach(dto -> { - String[] pIds = dto.getPIds().split(":"); - dto.setPId(pIds[pIds.length - 2]); - }); - return list; + return statsIssueDao.selectAgencyClosedIssueTotal(customerId, date); } @Override public List getAgencyClosedIssueInc(String customerId, String date) { - List list = statsIssueDao.selectAgencyClosedIssueInc(customerId, date); - list.forEach(dto -> { - String[] pIds = dto.getPIds().split(":"); - dto.setPId(pIds[pIds.length - 2]); - }); - return list; + return statsIssueDao.selectAgencyClosedIssueInc(customerId, date); } /** 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 739e69a780..b9a9b1274f 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,5 +1,7 @@ package com.epmet.service; +import com.epmet.dto.project.form.ProjectStatsFormDTO; + /** * 数据统计-项目 * @author sun @@ -10,11 +12,11 @@ public interface StatsProjectService { * @Author sun * @Description 数据-项目-机关日(月)统计 **/ - void agencyProjectStats(); + void agencyProjectStats(ProjectStatsFormDTO formDTO); /** * @Author sun * @Description 数据-项目-网格日(月)统计 **/ - void gridProjectStats(); + void gridProjectStats(ProjectStatsFormDTO 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 aded6e95d3..75d195285c 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 @@ -1,8 +1,10 @@ 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.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; @@ -19,6 +21,7 @@ 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; @@ -62,33 +65,43 @@ public class StatsProjectServiceImpl implements StatsProjectService { * @Description 数据-项目-机关日(月)统计 **/ @Override - public void agencyProjectStats() { - int pageNo = 1; - int pageSize = 100; - List customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - log.info("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId); - //遍历统计每一个客户数据 - customerAgencyStats(customerId); - } catch (Exception e) { - log.error("项目-机关-数据统计程序错误，对应客户Id:" + customerId, e); - log.error("Error creating model JSON", e); + public void agencyProjectStats(ProjectStatsFormDTO formDTO) { + Date date = yesterDay(); + //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行 + if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) { + date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN); + } + //入参有客户Id的则按客户Id执行，没有的则全部客户都执行 + if (null != formDTO.getCustomerId() && StringUtils.isNotBlank(formDTO.getCustomerId())) { + log.info("单独统计客户机关-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId()); + customerAgencyStats(formDTO.getCustomerId(), date); + } else { + int pageNo = 1; + int pageSize = 100; + List customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + log.info("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId); + //遍历统计每一个客户数据 + customerAgencyStats(customerId, date); + } catch (Exception e) { + log.error("项目-机关-数据统计程序错误，对应客户Id:" + customerId, e); + log.error("Error creating model JSON", e); + } } } - } - } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } } /** * @Author sun * @Description 分别统计机关日/月数据 **/ - public void customerAgencyStats(String customerId) { - Date date = yesterDay(); + public void customerAgencyStats(String customerId, Date date) { //1:查询各维度表Id,方便使用 DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); @@ -115,7 +128,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { //5.1:执行机关日数据统计 try { log.info("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:" + customerId); - agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList); + agencyDateProjectStats(customerId, dimId, date, dimAgencyList, projectList, processList); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "agencyDateProjectStats", customerId, dimId.getDateId()), e); } @@ -138,8 +151,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { * @Author sun * @Description 数据-项目-机关日统计 **/ - private String agencyDateProjectStats(String customerId, DimIdGenerator.DimIdBean dimId, List dimAgencyList, List projectList, List processList) { - Date date = yesterDay(); + private String agencyDateProjectStats(String customerId, DimIdGenerator.DimIdBean dimId, Date date, List dimAgencyList, List projectList, List processList) { //批量机关日统计新增对象 List projectDateEntityList = new ArrayList<>(); //计算百分比使用，保留小数点后两位 @@ -277,7 +289,6 @@ public class StatsProjectServiceImpl implements StatsProjectService { * @Description 数据-项目-机关月统计 **/ private String agencyMonthProjectStats(String customerId, DimIdGenerator.DimIdBean dimId, List dimAgencyList) { - Date date = yesterDay(); //批量月数据新增对象 List monthlyEntityList = new ArrayList<>(); @@ -353,36 +364,46 @@ public class StatsProjectServiceImpl implements StatsProjectService { /** * @Author sun - * @Description 数据-项目-机关日(月)统计 + * @Description 数据-项目-网格日(月)统计 **/ @Override - public void gridProjectStats() { - int pageNo = 1; - int pageSize = 100; - List customerIdList = null; - do { - customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); - if (!CollectionUtils.isEmpty(customerIdList)) { - for (String customerId : customerIdList) { - try { - log.info("for循环统计网格-项目-日月数据，当前统计的客户Id:" + customerId); - //遍历统计每一个客户数据 - customerGridStats(customerId); - } catch (Exception e) { - log.error("项目-网格-数据统计程序错误，对应客户Id:" + customerId, e); - log.error("Error creating model JSON", e); + public void gridProjectStats(ProjectStatsFormDTO formDTO) { + Date date = yesterDay(); + //入参有时间的则按具体时间执行,没有的则按当前时间前一天执行 + if (null != formDTO.getDate() && StringUtils.isNotBlank(formDTO.getDate())) { + date = DateUtils.parse(formDTO.getDate(), DateUtils.DATE_PATTERN); + } + //入参有客户Id的则按客户Id执行，没有的则全部客户都执行 + if (null != formDTO.getCustomerId() && StringUtils.isNotBlank(formDTO.getCustomerId())) { + log.info("单独统计客户网格-项目-日月数据，当前统计的客户Id:" + formDTO.getCustomerId()); + customerGridStats(formDTO.getCustomerId(), date); + } else { + int pageNo = 1; + int pageSize = 100; + List customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + log.info("for循环统计网格-项目-日月数据，当前统计的客户Id:" + customerId); + //遍历统计每一个客户数据 + customerGridStats(customerId, date); + } catch (Exception e) { + log.error("项目-网格-数据统计程序错误，对应客户Id:" + customerId, e); + log.error("Error creating model JSON", e); + } } } - } - } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } } /** * @Author sun * @Description 分别统计网格日/月数据 **/ - public void customerGridStats(String customerId) { - Date date = yesterDay(); + public void customerGridStats(String customerId, Date date) { //1:查询各维度表Id,方便使用 DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); @@ -407,7 +428,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { //5.1:执行网格日数据统计 try { log.info("StatsProjectServiceImpl.customerGridStats-开始执行机关日统计方法，方法名:gridDateProjectStats,客户Id:" + customerId); - gridDateProjectStats(customerId, dimId, dimGridList, projectList, processList); + gridDateProjectStats(customerId, dimId, date, dimGridList, projectList, processList); } catch (Exception e) { log.error(String.format(ProjectConstant.STATS_FAILED_PREFIX, "gridDateProjectStats", customerId, dimId.getDateId()), e); } @@ -431,8 +452,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { * @Author sun * @Description 数据-项目-网格日统计 **/ - private String gridDateProjectStats(String customerId, DimIdGenerator.DimIdBean dimId, List dimGridList, List projectList, List processList) { - Date date = yesterDay(); + private String gridDateProjectStats(String customerId, DimIdGenerator.DimIdBean dimId, Date date, List dimGridList, List projectList, List processList) { //批量网格日统计新增对象 List gridDateEntityList = new ArrayList<>(); //计算百分比使用，保留小数点后两位 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 9ed9ba7213..6098238d0b 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 @@ -961,8 +961,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { String key = pid.concat(StrConstant.UNDER_LINE).concat(tagId); FactTagViewedAgencyDailyEntity parentAgencyDailyEntity = agencyDailyEntityMap.get(key); DimAgencyEntity currentDimAgency = dimAgencyEntityMap.get(pid); - if (currentDimAgency == null && !NumConstant.ZERO_STR.equals(pid)) { - log.error("setTagViewedData2ParentAgency agencyId:{} not exist in dimAgency", pid); + if (currentDimAgency == null) { return; } if (parentAgencyDailyEntity == null) { @@ -986,8 +985,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { private void setPublishedData2ParentAgency(Map agencyDailyEntityMap, FactArticlePublishedAgencyDailyEntity agencySummary, FactArticlePublishedAgencyDailyEntity summary) { String pid = summary.getPid(); FactArticlePublishedAgencyDailyEntity parentAgency = agencyDailyEntityMap.get(pid); - if (parentAgency == null && !NumConstant.ZERO_STR.equals(pid)) { - log.error("setPublishedData2ParentAgency agencyId:{} not exist in dimAgency", pid); + if (parentAgency == null) { return; } parentAgency.setArticleTotalCount(parentAgency.getArticleTotalCount() + agencySummary.getArticleTotalCount()); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml index eb6fc087bb..34327672d6 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml @@ -13,7 +13,7 @@ AND customer_id = #{customerId} AND agency_id = #{agencyId} AND month_id = #{monthId} - ORDER BY created_time DESC,project_total DESC + ORDER BY date_id DESC,project_total DESC diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml index 3f386bf7ba..18bf844a61 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml @@ -13,7 +13,7 @@ AND customer_id = #{customerId} AND grid_id = #{gridId} AND month_id = #{monthId} - ORDER BY created_time DESC,project_total DESC + ORDER BY date_id DESC,project_total DESC 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 cdc8a32f46..d297147454 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 @@ -18,7 +18,7 @@ public interface StatsPublicityTaskService { * @date: 2020/6/22 9:09 * @author: jianjun liu */ - Result articleSummaryDailyStatsjob(); + Result articleSummaryDailyStatsjob(String date); /** * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 @@ -27,7 +27,7 @@ public interface StatsPublicityTaskService { * @date: 2020/6/22 9:09 * @author: jianjun liu */ - Result tagUsedDailyStatsjob(); + Result tagUsedDailyStatsjob(String date); /** * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -35,7 +35,7 @@ public interface StatsPublicityTaskService { * @date: 2020/6/22 9:09 * @author: jianjun liu */ - Result tagUsedMonthlyStatsjob(); + Result tagUsedMonthlyStatsjob(String date); /** * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 @@ -43,7 +43,7 @@ public interface StatsPublicityTaskService { * @date: 2020/6/22 9:09 * @author: jianjun liu */ - Result tagUsedQuarterlyStatsjob(); + Result tagUsedQuarterlyStatsjob(String date); /** * desc: 【日】 统计阅读最多的标签 包含 机关 网格 @@ -51,7 +51,7 @@ public interface StatsPublicityTaskService { * @date: 2020/6/22 9:09 * @author: jianjun liu */ - Result tagViewedDailyStatsjob(); + Result tagViewedDailyStatsjob(String date); /** * desc: 【月，季，年】 统计阅读最多的标签 包含 机关 网格 @@ -59,14 +59,15 @@ public interface StatsPublicityTaskService { * @date: 2020/6/22 9:09 * @author: jianjun liu */ - Result tagViewedMonthlyStatsjob(); + Result tagViewedMonthlyStatsjob(String date); /** * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 * * @date: 2020/6/22 9:09 * @author: jianjun liu + * @param date */ - Result tagViewedQuarterlyStatsjob(); + Result tagViewedQuarterlyStatsjob(String date); } 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 40368b169b..1cd14a482a 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,8 +1,8 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; -import com.epmet.service.StatsPublicityTaskService; import com.epmet.feign.DataStatisticalOpenFeignClient; +import com.epmet.service.StatsPublicityTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,8 +21,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService * @author: jianjun liu */ @Override - public Result articleSummaryDailyStatsjob() { - return dataStatsOpenFeignClient.articleSummaryDailyStatsjob(); + public Result articleSummaryDailyStatsjob(String date) { + return dataStatsOpenFeignClient.articleSummaryDailyStatsjob(date); } /** @@ -33,8 +33,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService * @author: jianjun liu */ @Override - public Result tagUsedDailyStatsjob() { - return dataStatsOpenFeignClient.tagUsedDailyStatsjob(); + public Result tagUsedDailyStatsjob(String date) { + return dataStatsOpenFeignClient.tagUsedDailyStatsjob(date); } /** @@ -44,8 +44,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService * @author: jianjun liu */ @Override - public Result tagUsedMonthlyStatsjob() { - return dataStatsOpenFeignClient.tagUsedMonthlyStatsjob(); + public Result tagUsedMonthlyStatsjob(String date) { + return dataStatsOpenFeignClient.tagUsedMonthlyStatsjob(date); } /** @@ -55,8 +55,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService * @author: jianjun liu */ @Override - public Result tagUsedQuarterlyStatsjob() { - return dataStatsOpenFeignClient.tagUsedQuarterlyStatsjob(); + public Result tagUsedQuarterlyStatsjob(String date) { + return dataStatsOpenFeignClient.tagUsedQuarterlyStatsjob(date); } /** @@ -66,8 +66,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService * @author: jianjun liu */ @Override - public Result tagViewedDailyStatsjob() { - return dataStatsOpenFeignClient.tagViewedDailyStatsjob(); + public Result tagViewedDailyStatsjob(String date) { + return dataStatsOpenFeignClient.tagViewedDailyStatsjob(date); } /** @@ -77,8 +77,8 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService * @author: jianjun liu */ @Override - public Result tagViewedMonthlyStatsjob() { - return dataStatsOpenFeignClient.tagViewedMonthlyStatsjob(); + public Result tagViewedMonthlyStatsjob(String date) { + return dataStatsOpenFeignClient.tagViewedMonthlyStatsjob(date); } /** @@ -86,9 +86,10 @@ public class StatsPublicityTaskServiceImpl implements StatsPublicityTaskService * * @date: 2020/6/22 9:09 * @author: jianjun liu + * @param date */ @Override - public Result tagViewedQuarterlyStatsjob() { - return dataStatsOpenFeignClient.tagViewedQuarterlyStatsjob(); + public Result tagViewedQuarterlyStatsjob(String date) { + return dataStatsOpenFeignClient.tagViewedQuarterlyStatsjob(date); } } 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 658850ba45..1738a07692 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 @@ -21,7 +21,7 @@ public class PublicityArticleSummaryDailyStatsTask implements ITask { @Override public void run(String params) { logger.debug("publicityArticleSummaryDailyStatsTask定时任务正在执行，参数为：{}", params); - Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(); + Result result = statsPublicityTaskService.articleSummaryDailyStatsjob(params); 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 ef5b147ac8..318dff6fb2 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 @@ -21,7 +21,7 @@ public class PublicityTagUsedDailyStatsTask implements ITask { @Override public void run(String params) { logger.debug("publicityTagUsedDailyStatsjob定时任务正在执行，参数为：{}", params); - Result result = statsPublicityTaskService.tagUsedDailyStatsjob(); + Result result = statsPublicityTaskService.tagUsedDailyStatsjob(params); 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 c0a7862b90..c87deeb616 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 @@ -21,7 +21,7 @@ public class PublicityTagUsedMonthlyStatsTask implements ITask { @Override public void run(String params) { logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); - Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(); + Result result = statsPublicityTaskService.tagUsedMonthlyStatsjob(params); 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 a9a816139c..1f13b6a817 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 @@ -21,7 +21,7 @@ public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask { @Override public void run(String params) { logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); - Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(); + Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(params); 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 5484440742..4bbb4b318d 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 @@ -21,7 +21,7 @@ public class PublicityTagViewedDailyStatsTask implements ITask { @Override public void run(String params) { logger.debug("publicityTagViewedDailyStatsTask定时任务正在执行，参数为：{}", params); - Result result = statsPublicityTaskService.tagViewedDailyStatsjob(); + Result result = statsPublicityTaskService.tagViewedDailyStatsjob(params); 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 d68677fde3..e2b01fe868 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 @@ -21,7 +21,7 @@ public class PublicityTagViewedMonthlyStatsTask implements ITask { @Override public void run(String params) { logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); - Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(); + Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(params); 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 7c295f83d0..afae0d7367 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 @@ -21,7 +21,7 @@ public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask { @Override public void run(String params) { logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); - Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(); + Result result = statsPublicityTaskService.tagViewedQuarterlyStatsjob(params); if (result.success()) { logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功"); } else {