Browse Source

大同计算修复bug

xieshengjie 2 years ago
parent
commit
e39a606bb1

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

@@ -104,13 +104,13 @@ public class RealtimeService {
                     Optional<ProEconWindturbineStatus2> first = proEconWindturbineStatus2Service.list(qw).stream().findFirst();
                     Optional<ProEconWindturbineStatus2> first = proEconWindturbineStatus2Service.list(qw).stream().findFirst();
                     if (first.isPresent()){
                     if (first.isPresent()){
                         ProEconWindturbineStatus2 proEconWindturbineStatus = first.get();
                         ProEconWindturbineStatus2 proEconWindturbineStatus = first.get();
-                        proEconWindturbineStatus.setStopTime(DateUtils.parseLongToDate(currentDate.getTime()));
+                        proEconWindturbineStatus.setStopTime(DateUtils.parseLongToDate(sdf.parse(DateUtils.toDate1(currentDate)).getTime()));
                         proEconWindturbineStatus.setStopHours(DateUtils.hoursDiff2(proEconWindturbineStatus.getStopTime(), proEconWindturbineStatus.getStartTime()));
                         proEconWindturbineStatus.setStopHours(DateUtils.hoursDiff2(proEconWindturbineStatus.getStopTime(), proEconWindturbineStatus.getStartTime()));
                         proEconWindturbineStatus.setLossPower(0.0);
                         proEconWindturbineStatus.setLossPower(0.0);
                         proEconWindturbineStatus.setSpeed(speed);
                         proEconWindturbineStatus.setSpeed(speed);
                         proEconWindturbineStatus.setAvgSpeed(0.0);
                         proEconWindturbineStatus.setAvgSpeed(0.0);
 //                        resultList.add(proEconWindturbineStatus2);
 //                        resultList.add(proEconWindturbineStatus2);
-                        proEconWindturbineStatus2Service.updateById(proEconWindturbineStatus2);
+                        proEconWindturbineStatus2Service.updateById(proEconWindturbineStatus);
                     }
                     }
 
 
                 }else {
                 }else {