diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupStatsFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupStatsFormDTO.java new file mode 100644 index 0000000000..f7f0ceb4c4 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/form/GroupStatsFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.group.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @CreateTime 2020/7/1 16:29 + */ +@Data +public class GroupStatsFormDTO implements Serializable { + + private static final long serialVersionUID = -4527492073390715391L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 日期 + */ + 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 095ec83bbd..f1f0e705d7 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.group.form.GroupStatsFormDTO; import com.epmet.dto.issue.form.IssueJobFromDTO; import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; @@ -91,7 +92,7 @@ public interface DataStatisticalOpenFeignClient { * @author zxc */ @PostMapping("/data/stats/statsgroup/groupgriddaily") - Result groupGridDaily(); + Result groupGridDaily(@RequestBody GroupStatsFormDTO formDTO); /** * @Description 统计 “网格小组”， dim：【机关-日】 @@ -99,7 +100,7 @@ public interface DataStatisticalOpenFeignClient { * @author zxc */ @PostMapping("/data/stats/statsgroup/groupagencydaily") - Result groupAgencyDaily(); + Result groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO); /** * @Description 统计 “网格小组”， dim：【机关-月】 @@ -107,7 +108,7 @@ public interface DataStatisticalOpenFeignClient { * @author zxc */ @PostMapping("/data/stats/statsgroup/groupagencymonthly") - Result groupAgencyMonthly(); + Result groupAgencyMonthly(@RequestBody GroupStatsFormDTO 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 93d1ffa433..79186a8277 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.group.form.GroupStatsFormDTO; import com.epmet.dto.issue.form.IssueJobFromDTO; import com.epmet.feign.DataStatisticalOpenFeignClient; import org.springframework.stereotype.Component; @@ -98,18 +99,18 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp } @Override - public Result groupGridDaily() { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupGridDaily"); + public Result groupGridDaily(GroupStatsFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupGridDaily",formDTO); } @Override - public Result groupAgencyDaily() { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyDaily"); + public Result groupAgencyDaily(GroupStatsFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyDaily",formDTO); } @Override - public Result groupAgencyMonthly() { - return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyMonthly"); + public Result groupAgencyMonthly(GroupStatsFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAgencyMonthly",formDTO); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java index b2f6f399f7..18ccdfe3ab 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsGroupController.java @@ -1,11 +1,9 @@ package com.epmet.controller; +import com.epmet.dto.group.form.GroupStatsFormDTO; import com.epmet.service.StatsGroupService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -32,8 +30,8 @@ public class StatsGroupController { * @author zxc */ @PostMapping("groupgriddaily") - public void groupGridDaily(@RequestParam(value = "date",required = false)Date date){ - statsGroupService.groupGridDaily(date); + public void groupGridDaily(@RequestBody GroupStatsFormDTO formDTO){ + statsGroupService.groupGridDaily(formDTO); } /** @@ -42,8 +40,8 @@ public class StatsGroupController { * @author zxc */ @PostMapping("groupagencydaily") - public void groupAgencyDaily(@RequestParam(value = "date",required = false)Date date){ - statsGroupService.groupAgencyDaily(date); + public void groupAgencyDaily(@RequestBody GroupStatsFormDTO formDTO){ + statsGroupService.groupAgencyDaily(formDTO); } /** @@ -52,8 +50,8 @@ public class StatsGroupController { * @author zxc */ @PostMapping("groupagencymonthly") - public void groupAgencyMonthly(@RequestParam(value = "date",required = false)Date date){ - statsGroupService.groupAgencyMonthly(date); + public void groupAgencyMonthly(@RequestBody GroupStatsFormDTO formDTO){ + statsGroupService.groupAgencyMonthly(formDTO); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java index b3444d34d4..9b922fba33 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsGroupService.java @@ -1,5 +1,7 @@ package com.epmet.service; +import com.epmet.dto.group.form.GroupStatsFormDTO; + import java.util.Date; /** @@ -12,18 +14,18 @@ public interface StatsGroupService { * @Description 统计 “小组” 有关数据， dim：【网格-日】 * @author zxc */ - void groupGridDaily(Date date); + void groupGridDaily(GroupStatsFormDTO formDTO); /** * @Description 统计 “小组” 有关数据， dim：【机关-日】 * @author zxc */ - void groupAgencyDaily(Date date); + void groupAgencyDaily(GroupStatsFormDTO formDTO); /** * @Description 统计 “小组” 有关数据， dim：【机关-月】 * @author zxc */ - void groupAgencyMonthly(Date date); + void groupAgencyMonthly(GroupStatsFormDTO formDTO); } 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 1571c6b3fe..c5da9d5a34 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 @@ -1,9 +1,11 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.GroupConstant; import com.epmet.dto.AgencySubTreeDto; import com.epmet.dto.group.form.AgencyMonthlyFormDTO; +import com.epmet.dto.group.form.GroupStatsFormDTO; import com.epmet.dto.group.result.*; import com.epmet.dto.stats.DimAgencyDTO; import com.epmet.entity.stats.DimAgencyEntity; @@ -56,13 +58,13 @@ public class StatsGroupServiceImpl implements StatsGroupService { * @author zxc */ @Override - public void groupGridDaily(Date date) { + public void groupGridDaily(GroupStatsFormDTO formDTO) { Integer pageNo = NumConstant.ONE; Integer pageSize = NumConstant.ONE_HUNDRED; List customerIds; do { customerIds = dimCustomerService.selectCustomerIdPage(pageNo,pageSize); - DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); + DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO); if (customerIds.size() != NumConstant.ZERO){ customerIds.forEach(customerId -> { try { @@ -83,14 +85,14 @@ public class StatsGroupServiceImpl implements StatsGroupService { * @author zxc */ @Override - public void groupAgencyDaily(Date date) { + public void groupAgencyDaily(GroupStatsFormDTO formDTO) { Integer pageNo = NumConstant.ONE; Integer pageSize = NumConstant.ONE_HUNDRED; List customerIds; do { customerIds = dimCustomerService.selectCustomerIdPage(pageNo++,pageSize); if (customerIds.size() != NumConstant.ZERO){ - DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); + DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO); customerIds.forEach(customerId -> { try { List customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId); @@ -109,8 +111,8 @@ public class StatsGroupServiceImpl implements StatsGroupService { * @author zxc String customerId */ @Override - public void groupAgencyMonthly(Date date) { - DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); + public void groupAgencyMonthly(GroupStatsFormDTO formDTO) { + DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO); String monthId = dimIdBean.getMonthId(); List lastDayAgency = factGroupAgencyDailyService.getLastDayAgency(monthId); List monthGroupIncr = factGroupAgencyDailyService.getMonthGroupIncr(monthId); @@ -308,9 +310,9 @@ public class StatsGroupServiceImpl implements StatsGroupService { * @param * @author zxc */ - public DimIdGenerator.DimIdBean getDimIdBean(Date date){ - if (date != null){ - return DimIdGenerator.getDimIdBean(date); + public DimIdGenerator.DimIdBean getDimIdBean(GroupStatsFormDTO formDTO){ + if (formDTO.getDate() != null){ + return DimIdGenerator.getDimIdBean(DateUtils.parse(formDTO.getDate(),DateUtils.DATE_PATTERN)); } ZoneId zoneId = ZoneId.systemDefault(); LocalDate localDate = LocalDate.now().minusDays(NumConstant.ONE); diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsGroupService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsGroupService.java index db3ed102d1..84013b997d 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsGroupService.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsGroupService.java @@ -13,20 +13,20 @@ public interface StatsGroupService { * @param * @author zxc */ - Result groupGridDaily(); + Result groupGridDaily(String date); /** * @Description 统计 “网格小组”， dim：【机关-日】 * @param * @author zxc */ - Result groupAgencyDaily(); + Result groupAgencyDaily(String date); /** * @Description 统计 “网格小组”， dim：【机关-月】 * @param * @author zxc */ - Result groupAgencyMonthly(); + Result groupAgencyMonthly(String date); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 4aec7898dd..669a97a60c 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.group.form.GroupStatsFormDTO; import com.epmet.service.StatsGroupService; import com.epmet.feign.DataStatisticalOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; @@ -17,17 +18,23 @@ public class StatsGroupServiceImpl implements StatsGroupService { private DataStatisticalOpenFeignClient statsPublicityFeignClient; @Override - public Result groupGridDaily() { - return statsPublicityFeignClient.groupGridDaily(); + public Result groupGridDaily(String date) { + GroupStatsFormDTO formDTO = new GroupStatsFormDTO(); + formDTO.setDate(date); + return statsPublicityFeignClient.groupGridDaily(formDTO); } @Override - public Result groupAgencyDaily() { - return statsPublicityFeignClient.groupAgencyDaily(); + public Result groupAgencyDaily(String date) { + GroupStatsFormDTO formDTO = new GroupStatsFormDTO(); + formDTO.setDate(date); + return statsPublicityFeignClient.groupAgencyDaily(formDTO); } @Override - public Result groupAgencyMonthly() { - return statsPublicityFeignClient.groupAgencyMonthly(); + public Result groupAgencyMonthly(String date) { + GroupStatsFormDTO formDTO = new GroupStatsFormDTO(); + formDTO.setDate(date); + return statsPublicityFeignClient.groupAgencyMonthly(formDTO); } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java index 695b4aae18..57bd68bfc8 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java @@ -24,7 +24,7 @@ public class StatsGroupAgencyDailyTask implements ITask { @Override public void run(String params) { logger.debug("StatsGroupAgencyDailyTask定时任务正在执行，参数为：{}", params); - Result result = statsGroupService.groupAgencyDaily(); + Result result = statsGroupService.groupAgencyDaily(params); if (result.success()){ logger.debug("StatsGroupAgencyDailyTask定时任务正在执行定时任务执行成功"); }else { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java index bcd59c4047..3841ed339e 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java @@ -24,7 +24,7 @@ public class StatsGroupAgencyMonthlyTask implements ITask { @Override public void run(String params) { logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行，参数为：{}", params); - Result result = statsGroupService.groupAgencyMonthly(); + Result result = statsGroupService.groupAgencyMonthly(params); if (result.success()){ logger.debug("StatsGroupAgencyMonthlyTask定时任务正在执行定时任务执行成功"); }else { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java index 780ba44f18..f666e4340c 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java @@ -25,7 +25,7 @@ public class StatsGroupGridDailyTask implements ITask { @Override public void run(String params) { logger.debug("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); - Result result = statsGroupService.groupGridDaily(); + Result result = statsGroupService.groupGridDaily(params); if (result.success()){ logger.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功"); }else {