debug 抽取数据增强到按照指定时间段抽取

xianpengcheng
1 parent 652ffd0e
Showing 1 changed file with 17 additions and 5 deletions
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/debug/DebugController.java
@@ -40,14 +40,26 @@ public class DebugController {
     @GetMapping("/run/publicReportData")
     @ControllerMethod("公共池报表数据准备")
     public Message<Void> publicReportData(@RequestParam(required = false) Long groupId,
-                                          @RequestParam(required = false)Date date) {
+                                          @RequestParam Date start,@RequestParam Date end) {
+        if (end.after(new Date())){
+            end = new Date();
+        }
+        if (start.after(end)){
+            throw new RuntimeException("开始时间大于结束时间");
+        }
         if (Objects.isNull(groupId)) {
             groupId = 2L;
         }
-        if (Objects.isNull(date)) {
-            publicReportBizService.extracting(LocalDate.now().minusDays(1),groupId);
-        } else {
-            publicReportBizService.extracting(DateUtil.date2LocalDate(date),groupId);
+        LocalDate dateStart = DateUtil.date2LocalDate(start);
+        LocalDate dateEnd = DateUtil.date2LocalDate(end);
+        log.info("入参dateStart: {}, dateEnd: {}",dateStart,dateEnd);
+        if (dateStart.isBefore(dateEnd)){
+            while (dateStart.isBefore(dateEnd) || dateStart.isEqual(dateEnd)){
+                publicReportBizService.extracting(dateStart,groupId);
+                dateStart = dateStart.plusDays(1);
+            }
+        }else {
+            publicReportBizService.extracting(dateStart,groupId);
         }
         return success();
     }