测试切入切出风速存数据库2

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

@@ -71,8 +71,7 @@ public class ZhiBiaoCalculation {
             //风速测点key
             String windSpeedKey = null;
 
-            //平均切入风速
-            double avgCutInWindSpeedOne = 0;
+
 
 
             //遍历pointInfos，找出pointData1的id和pointInfos中相等的，取出pointInfo的pointKey
@@ -132,6 +131,9 @@ public class ZhiBiaoCalculation {
             }
             //遍历map集合，取出每个风机的所有切入风速，算一个平均值
             HashMap<String, Double> mapTurbineValues = mapIn.get(turbine.getTurbineId());
+
+            //平均切入风速
+            double avgCutInWindSpeed = 0;
             if (mapTurbineValues != null) {
                 AtomicReference<Double> sum = new AtomicReference<>(0.0);
                 //遍历mapTurbineValues，V大于5的舍弃，剩余算平均值
@@ -144,20 +146,19 @@ public class ZhiBiaoCalculation {
                     sum.updateAndGet(v1 -> v1 + v);
                 });
 
-
                 //如果值为空则置0
                 if (sum.get() == 0) {
-                    avgCutInWindSpeedOne = 0;
+                    avgCutInWindSpeed = 0;
                 } else {
-                    avgCutInWindSpeedOne = sum.get() / mapTurbineValues.size();
+                    avgCutInWindSpeed= sum.get() / mapTurbineValues.size();
                 }
-
-                System.out.println(turbine.getTurbineId() + "切入平均风速" + avgCutInWindSpeedOne + "时间" + timeBegin);
+                System.out.println(turbine.getTurbineId() + "切入平均风速" + avgCutInWindSpeed + "时间" + timeBegin);
             }
 
             //遍历map集合，取出每个风机的所有切出风速，算一个平均值
             HashMap<String, Double> mapTurbineValues2 = mapOut.get(turbine.getTurbineId());
 
+            double avgCutOutWindSpeed;
             if (mapTurbineValues2 != null) {
                 AtomicReference<Double> sum = new AtomicReference<>(0.0);
 
@@ -169,7 +170,7 @@ public class ZhiBiaoCalculation {
                 mapTurbineValues2.forEach((k, v) -> {
                     sum.updateAndGet(v1 -> v1 + v);
                 });
-                double avgCutOutWindSpeed;
+
                 if (sum.get() == 0) {
                     avgCutOutWindSpeed = 0;
                 } else {
@@ -187,15 +188,19 @@ public class ZhiBiaoCalculation {
             turbineInfoDayQueryWrapper.eq("record_date", timeBegin.toJdkDate());
             TurbineInfoDay one = turbineInfoDayService.getOne(turbineInfoDayQueryWrapper);
             System.out.println(one);
-//            if (one == null) {
-//                TurbineInfoDay turbineInfoDay = new TurbineInfoDay();
-//                turbineInfoDay.setTurbineId(turbine.getTurbineId());
-//                turbineInfoDay.setRecordDate(timeBegin.toJdkDate());
-//                turbineInfoDay.setXfqrfs(avgCutInWindSpeedOne);
-//            }else {
-//                one.setXfqrfs(avgCutInWindSpeedOne);
-//            }
-//            System.out.println(one);
+            if (one == null) {
+                TurbineInfoDay turbineInfoDay = new TurbineInfoDay();
+                turbineInfoDay.setTurbineId(turbine.getTurbineId());
+                turbineInfoDay.setRecordDate(timeBegin.toJdkDate());
+                turbineInfoDay.setXfqrfs(avgCutInWindSpeed);
+                System.out.println(turbineInfoDay);
+                turbineInfoDayService.save(turbineInfoDay);
+            }else {
+                one.setXfqrfs(avgCutInWindSpeed);
+                System.out.println(one);
+                turbineInfoDayService.updateById(one);
+            }
+
 //            turbineInfoDayService.saveOrUpdate(one);
 
         }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,6 +28,19 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
     public List<TurbineInfoDay> list(Wrapper<TurbineInfoDay> queryWrapper) {
         return super.list(queryWrapper);
     }
+
+    //save方法
+    @Override
+    public boolean save(TurbineInfoDay entity) {
+        return super.save(entity);
+    }
+    //根据ID更新
+    @Override
+    public boolean updateById(TurbineInfoDay entity) {
+        return super.updateById(entity);
+    }
+
+
     @Override
     public TurbineInfoDay getOne(Wrapper<TurbineInfoDay> queryWrapper) {
         return super.getOne(queryWrapper);