预测历史数据太慢修正

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

@@ -2128,6 +2128,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
             entity.setPointDatas(list);
         }
     }
+
     public void getSectionDataByEntity(List<PointInfo> entitys, URI uri, Date end) {
         String collect = entitys.stream().map(PointInfo::getPointKey).collect(Collectors.joining(","));
         Map<String, PointData> section1 = adapter.getHistorySection(uri, collect, end.getTime());
@@ -5240,7 +5241,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         projectInfoMin2Service.saveBatch(min2s);
     }
 
-    public ProjectInfoMin2 calcProjectPjfsHjwdMin2(Date end, String pjId) {
+    public ProjectInfoMin2 calcProjectPjfsHjwdMin2(Date end, String pjId, boolean b) {
         DateTime begin = DateUtil.offsetMinute(end, -15);
         //风速
         List<PointInfo> entityFs = getEntity("AI066", "turbine");
@@ -5291,7 +5292,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         min2.setRfdl(rfdl);
         min2.setHjwd(hjwds.stream().filter(d -> d != 0.0).mapToDouble(Double::doubleValue).average().orElse(0.0));
         sm2fs2pm2(fss, min2);
-        projectInfoMin2Service.save(min2);
+        if (b) projectInfoMin2Service.save(min2);
         return min2;
     }
 
@@ -5344,7 +5345,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
         }
     }
 
-    public StationInfoMin2 calcStationPjfsHjwdMin2(Date end, String stId) {
+    public StationInfoMin2 calcStationPjfsHjwdMin2(Date end, String stId, boolean b) {
         DateTime begin = DateUtil.offsetMinute(end, -15);
         //出线
         List<PointInfo> entityCx = getEntity("AGC001", "booster");
@@ -5409,7 +5410,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
             hjwds.add(v);
         }
         min2.setHjwd(hjwds.stream().filter(d -> d != 0.0).mapToDouble(Double::doubleValue).average().orElse(0.0));
-        stationInfoMin2Service.save(min2);
+        if (b) stationInfoMin2Service.save(min2);
         return min2;
     }
 

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

@@ -371,7 +371,7 @@ public class PredictController {
         DateTime minBegin = middle, minEnd = DateUtil.offsetMinute(middle, 15);
         while (minEnd.isBefore(end)) {
             minEnd = DateUtil.offsetMinute(middle, i * 15);
-            StationInfoMin2 day = task.calcStationPjfsHjwdMin2(minEnd, stationId);
+            StationInfoMin2 day = task.calcStationPjfsHjwdMin2(minEnd, stationId, true);
             System.out.println(minBegin.toString() + "," + minEnd.toString());
             i++;
             minBegin = minEnd;
@@ -404,7 +404,7 @@ public class PredictController {
         DateTime minBegin = middle, minEnd = DateUtil.offsetMinute(middle, 15);
         while (minEnd.isBefore(end)) {
             minEnd = DateUtil.offsetMinute(middle, i * 15);
-            ProjectInfoMin2 min2 = task.calcProjectPjfsHjwdMin2(minEnd, projectId);
+            ProjectInfoMin2 min2 = task.calcProjectPjfsHjwdMin2(minEnd, projectId,true);
             System.out.println(minBegin.toString() + "," + minEnd.toString());
             i++;
             minBegin = minEnd;
@@ -427,7 +427,7 @@ public class PredictController {
         DateTime date = DateUtil.beginOfMinute(DateUtil.date());
         int i = Math.floorDiv(date.minute(), 15) * 15;
         date.setMinutes(i);
-        StationInfoMin2 min2 = task.calcStationPjfsHjwdMin2(date, stationId);
+        StationInfoMin2 min2 = task.calcStationPjfsHjwdMin2(date, stationId,false);
         if (stationId.equals("GJNY_SXGS_CSL_FDC_STA")) min2.setYxts(0L);
         return min2;
     }
@@ -436,7 +436,7 @@ public class PredictController {
         DateTime date = DateUtil.beginOfMinute(DateUtil.date());
         int i = Math.floorDiv(date.minute(), 15) * 15;
         date.setMinutes(i);
-        ProjectInfoMin2 min2 = task.calcProjectPjfsHjwdMin2(date, projectId);
+        ProjectInfoMin2 min2 = task.calcProjectPjfsHjwdMin2(date, projectId,false);
         return min2;
     }
 

universal-computing-platform/src/main/java/com/ruoyi/ucp/service/impl/ProjectInfoMin2ServiceImpl.java

@@ -29,6 +29,11 @@ public class ProjectInfoMin2ServiceImpl extends ServiceImpl<ProjectInfoMin2Mappe
     }
 
     @Override
+    public ProjectInfoMin2 getOne(Wrapper<ProjectInfoMin2> queryWrapper) {
+        return super.getOne(queryWrapper);
+    }
+
+    @Override
     public boolean save(ProjectInfoMin2 entity) {
         return super.save(entity);
     }

universal-computing-platform/src/main/java/com/ruoyi/ucp/service/impl/StationInfoMin2ServiceImpl.java

@@ -28,6 +28,11 @@ public class StationInfoMin2ServiceImpl extends ServiceImpl<StationInfoMin2Mappe
     }
 
     @Override
+    public StationInfoMin2 getOne(Wrapper<StationInfoMin2> queryWrapper) {
+        return super.getOne(queryWrapper);
+    }
+
+    @Override
     public boolean saveOrUpdate(StationInfoMin2 entity) {
         return super.saveOrUpdate(entity);
     }