Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_add_closedCount_category

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -1075,4 +1075,28 @@ public class DemoController {
         screenProjectDataService.extractCategory(formDTO.getCustomerId());
         return new Result();
     }
+
+    @Autowired
+    private ScreenProjectCategoryGridAndOrgDailyService screenProjectCategoryGridAndOrgDailyService;
+
+    @PostMapping("gridandorgdailynew")
+    public Result<String> gridAndDaily(@RequestParam("customerId")String customerId,@RequestParam("dateId")String dateId,
+                           @RequestParam(name = "startDate",required = false)String startDate,
+                           @RequestParam(name = "endDate",required = false)String endDate
+    ){
+        long start = System.currentTimeMillis();
+        if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
+            List<String> daysBetween = DateUtils.getDaysBetween(startDate, endDate);
+            daysBetween.forEach(d -> {
+                screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId,d);
+                screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId,d);
+            });
+        }else {
+            screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId,dateId);
+            screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId,dateId);
+        }
+        long end = System.currentTimeMillis();
+        long l = (end - start) / 1000;
+        return new Result<String>().ok("gridAndOrgDaily耗时" + l+ "s");
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridAndOrgDailyService.java

@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 项目(事件)分类按 组织——组织——按天统计
+ * 项目(事件)分类按 网格——组织——按天统计
  */
 public interface ScreenProjectCategoryGridAndOrgDailyService {