大同计算修复bug

web/gdsx-ghost/src/main/java/com/gyee/ghost/service/RealtimeService.java

@@ -92,8 +92,8 @@ public class RealtimeService {
                     proEconWindturbineStatus2.setAvgSpeed(0.0);
                     String statusName = statusmxMap.get(new Double(aDouble).intValue());
                     proEconWindturbineStatus2.setStatusDesc(statusName);
-//                    resultList.add(proEconWindturbineStatus2);
-                    proEconWindturbineStatus2Service.save(proEconWindturbineStatus2);
+                    resultList.add(proEconWindturbineStatus2);
+//                    proEconWindturbineStatus2Service.save(proEconWindturbineStatus2);
 
                     QueryWrapper<ProEconWindturbineStatus2> qw = new QueryWrapper<>();
                     qw.eq("windTurbine_Id",wt.getId());
@@ -101,6 +101,7 @@ public class RealtimeService {
 //                    String toDate = DateUtils.toDate(beforeFive);
 //                    Date parse = sdf.parse(toDate);
                     qw.eq("stop_Time",befroeDate);
+                    qw.orderByDesc("start_time");
                     Optional<ProEconWindturbineStatus2> first = proEconWindturbineStatus2Service.list(qw).stream().findFirst();
                     if (first.isPresent()){
                         ProEconWindturbineStatus2 proEconWindturbineStatus = first.get();
@@ -109,8 +110,8 @@ public class RealtimeService {
                         proEconWindturbineStatus.setLossPower(0.0);
                         proEconWindturbineStatus.setSpeed(speed);
                         proEconWindturbineStatus.setAvgSpeed(0.0);
-//                        resultList.add(proEconWindturbineStatus2);
-                        proEconWindturbineStatus2Service.updateById(proEconWindturbineStatus);
+                        resultList.add(proEconWindturbineStatus);
+//                        proEconWindturbineStatus2Service.updateById(proEconWindturbineStatus);
                     }
 
                 }else {
@@ -120,6 +121,7 @@ public class RealtimeService {
 //                    String toDate = DateUtils.toDate(beforeFive);
 //                    Date parse = sdf.parse(toDate);
                     qw.eq("stop_Time",befroeDate);
+                    qw.orderByDesc("start_time");
                     Optional<ProEconWindturbineStatus2> first = proEconWindturbineStatus2Service.list(qw).stream().findFirst();
                     if (first.isPresent()){
                         ProEconWindturbineStatus2 proEconWindturbineStatus2 = first.get();
@@ -128,8 +130,8 @@ public class RealtimeService {
                         proEconWindturbineStatus2.setLossPower(0.0);
                         proEconWindturbineStatus2.setSpeed(speed);
                         proEconWindturbineStatus2.setAvgSpeed(0.0);
-                        proEconWindturbineStatus2Service.updateById(proEconWindturbineStatus2);
-//                        resultList.add(proEconWindturbineStatus2);
+//                        proEconWindturbineStatus2Service.updateById(proEconWindturbineStatus2);
+                        resultList.add(proEconWindturbineStatus2);
                     }else {
                         ProEconWindturbineStatus2 proEconWindturbineStatus2 = new ProEconWindturbineStatus2();
                         proEconWindturbineStatus2.setId(CommonUtils.getUUID());
@@ -146,8 +148,8 @@ public class RealtimeService {
                         proEconWindturbineStatus2.setAvgSpeed(0.0);
                         String statusName = statusmxMap.get(new Double(aDouble).intValue());
                         proEconWindturbineStatus2.setStatusDesc(statusName);
-//                        resultList.add(proEconWindturbineStatus2);
-                        proEconWindturbineStatus2Service.save(proEconWindturbineStatus2);
+                        resultList.add(proEconWindturbineStatus2);
+//                        proEconWindturbineStatus2Service.save(proEconWindturbineStatus2);
                     }
                 }
             } catch (Exception e) {
@@ -156,7 +158,7 @@ public class RealtimeService {
 
         });
 
-//        proEconWindturbineStatus2Service.saveOrUpdateBatch(resultList);
+        proEconWindturbineStatus2Service.saveOrUpdateBatch(resultList);
 
     }