diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java index 37e901410e..829a345264 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java @@ -786,14 +786,23 @@ public class DemoController { } - @PostMapping("event-all") - public Result screenProjectQuantityOrgMonthly(@RequestParam("customerId") String customerId, - @RequestParam("dateId") String dateId, - @RequestParam("monthId") String monthId) { + @PostMapping("event-all-daily") + public Result eventAllDaily(@RequestParam("customerId") String customerId, + @RequestParam("dateId") String dateId) { screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId); - screenProjectQuantityGridMonthlyService.extractionProjectGridMonthly(customerId, monthId); screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId); - screenProjectQuantityOrgMonthlyService.extractionProjectOrgMonthly(customerId, monthId); + return new Result(); + } + + @PostMapping("event-all-monthly") + public Result eventAllMonthly(@RequestParam("customerId") String customerId, + @RequestParam("startMonthId") String startMonthId, + @RequestParam("endMonthId") String endMonthId) { + List monthIds = DateUtils.getMonthBetween(startMonthId,endMonthId); + for(String monthId:monthIds){ + screenProjectQuantityGridMonthlyService.extractionProjectGridMonthly(customerId, monthId); + screenProjectQuantityOrgMonthlyService.extractionProjectOrgMonthly(customerId, monthId); + } return new Result(); } @@ -805,4 +814,11 @@ public class DemoController { ndddYhjfService.difficultyDataHub(param); return new Result(); } + + public static void main(String[] args) { + List monthIds = DateUtils.getMonthBetween("202001","202012"); + for(String monthId:monthIds){ + System.out.println(monthId); + } + } }