333

ruoyi-admin/src/main/java/com/ruoyi/web/controller/JavaFunctionJobHandler.java

@@ -2147,6 +2147,12 @@ public class JavaFunctionJobHandler extends IJobHandler {
         //风速
         List<PointInfo> entityFs = getEntity("AI066", "turbine");
         getSnapDataByEntity(entityFs, begin, end, 15);
+        for (PointInfo entityF : entityFs) {
+            List<PointData> dataList = entityF.getPointDatas().stream().filter(pd -> pd.getValue() > 20).collect(Collectors.toList());
+            if (dataList.size() > 0) {
+                System.out.println();
+            }
+        }
         Map<String, Map<String, List<PointData>>> fsMapMap = entityFs.stream().collect(Collectors.groupingBy(PointInfo::getStationId,
                 Collectors.toMap(PointInfo::getTurbineId, PointInfo::getPointDatas)));
         //功率
@@ -2218,7 +2224,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
             tid.setDjss(tid.getDjss() * zssXs);
             tid.setGzss(tid.getGzss() * zssXs);
         });
-        turbineInfoMinService.saveOrUpdateBatch(dayMap.values());
+        //turbineInfoMinService.saveOrUpdateBatch(dayMap.values());
     }
 
     public void calcStation5s(DateTime begin, DateTime end) {
@@ -2327,7 +2333,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         });
         //turbineInfoDayService.saveOrUpdateBatch(byDate);
         PointData data = new PointData(end.getTime(), NumberUtil.round(sum, 4).doubleValue());
-        data.setTagName("区域集控.惠安风场.统计计算.总日限电量");
+        data.setTagName("区域集控.惠安风场.光耀计算.日限电量");
         adapter.writeHistoryBatch(mqttUri(), Collections.singletonList(data));
     }
 

ruoyi-admin/src/test/java/com/ruoyi/NewTests.java

@@ -226,8 +226,8 @@ public class NewTests {
     @Test
     public void test3() {
         // 创建日期范围生成器
-        DateTime start = DateUtil.parse("2025-09-08");
-        DateTime stop = DateUtil.parse("2025-09-09");
+        DateTime start = DateUtil.parse("2025-09-10");
+        DateTime stop = DateUtil.parse("2025-09-10");
         //DateRange range = DateUtil.range(start, end, DateField.MONTH);
         DateRange range = DateUtil.range(start, stop, DateField.HOUR_OF_DAY);
         for (DateTime begin : range) {
@@ -580,7 +580,7 @@ public class NewTests {
         //task.abc(parse);
         //task.calcStationKydlzql(parse);
         //task.calcCzRxd2(DateUtil.beginOfDay(parse), DateUtil.endOfDay(parse));
-        //task.haxdRecalc(parse);
+        task.haxdRecalc(parse);
         //task.calcHaBbHz(parse);
         //task.calcStationKydlzql(parse);
         task.calcStationNPjfs(parse);