Browse Source

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

malijun 8 months ago
parent
commit
ac1530f2bf

+ 13 - 16
ruoyi-admin/src/test/java/com/ruoyi/ZhiBiaoCalculation.java

@@ -135,10 +135,8 @@ public class ZhiBiaoCalculation {
             if (mapTurbineValues != null) {
                 AtomicReference<Double> sum = new AtomicReference<>(0.0);
                 //遍历mapTurbineValues,V大于5的舍弃,剩余算平均值
-                for (Map.Entry<String, Double> entry : mapTurbineValues.entrySet()) {
-                    String key = entry.getKey();
-                    Double value = entry.getValue();
-                    if (value > 5) {
+                for ( String key : mapTurbineValues.keySet()) {
+                    if (mapTurbineValues.get(key) > 5) {
                         mapTurbineValues.remove(key);
                     }
                 }
@@ -163,10 +161,8 @@ public class ZhiBiaoCalculation {
             if (mapTurbineValues2 != null) {
                 AtomicReference<Double> sum = new AtomicReference<>(0.0);
 
-                for (Map.Entry<String, Double> entry : mapTurbineValues2.entrySet()) {
-                    String key = entry.getKey();
-                    Double value = entry.getValue();
-                    if (value > 5) {
+                for ( String key : mapTurbineValues2.keySet()) {
+                    if (mapTurbineValues2.get(key) > 5) {
                         mapTurbineValues2.remove(key);
                     }
                 }
@@ -190,15 +186,16 @@ public class ZhiBiaoCalculation {
             turbineInfoDayQueryWrapper.eq("turbine_id", turbine.getTurbineId());
             turbineInfoDayQueryWrapper.eq("record_date", timeBegin.toJdkDate());
             TurbineInfoDay one = turbineInfoDayService.getOne(turbineInfoDayQueryWrapper);
-            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(avgCutInWindSpeedOne);
+//            }else {
+//                one.setXfqrfs(avgCutInWindSpeedOne);
+//            }
+//            System.out.println(one);
 //            turbineInfoDayService.saveOrUpdate(one);
 
         }

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

@@ -27,6 +27,10 @@ public class TurbineInfoDayServiceImpl extends ServiceImpl<TurbineInfoDayMapper,
     public List<TurbineInfoDay> list(Wrapper<TurbineInfoDay> queryWrapper) {
         return super.list(queryWrapper);
     }
+    @Override
+    public TurbineInfoDay getOne(Wrapper<TurbineInfoDay> queryWrapper) {
+        return super.getOne(queryWrapper);
+    }
 
     @Override
     public boolean saveOrUpdateBatch(Collection<TurbineInfoDay> entityList) {