和风部署状态明细流水服务

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

@@ -71,13 +71,13 @@ public class RealtimeService {
                 try {
                     PointData realData = edosUtil.getSectionData(windturbinetestingpointai,currentDate.getTime());
 
-                    double aDouble = realData.getPointValueInDouble();
+                    Double aDouble = realData.getPointValueInDouble();
 
                     PointData sectionData = edosUtil.getSectionData(windturbinetestingpointai, befroeDate.getTime());
-                    double tempDouble = sectionData.getPointValueInDouble();
-                    double speed = edosUtil.getRealData(windturbinetestingpointaifs).getPointValueInDouble();
+                    Double tempDouble = sectionData.getPointValueInDouble();
+                    double speed = edosUtil.getSectionData(windturbinetestingpointaifs,currentDate.getTime()).getPointValueInDouble();
 
-                    if (isEq(DateUtils.toDate(currentDate),DateUtils.toDate(startOfDay)) || aDouble != tempDouble){
+                    if (isEq(DateUtils.toDate(currentDate),DateUtils.toDate(startOfDay)) || aDouble.equals(tempDouble)){
                         ProEconWindturbineStatus2 proEconWindturbineStatus2 = new ProEconWindturbineStatus2();
                         proEconWindturbineStatus2.setId(CommonUtils.getUUID());
                         proEconWindturbineStatus2.setWindpowerstationId(wt.getWindpowerstationid());
@@ -89,10 +89,10 @@ public class RealtimeService {
                         proEconWindturbineStatus2.setLossPower(0.0);
                         proEconWindturbineStatus2.setShutdownEventId("");
                         proEconWindturbineStatus2.setProjectId(wt.getProjectid());
-                        proEconWindturbineStatus2.setSatusCode(new Double(aDouble).intValue());
+                        proEconWindturbineStatus2.setSatusCode(aDouble.intValue());
                         proEconWindturbineStatus2.setSpeed(speed);
                         proEconWindturbineStatus2.setAvgSpeed(0.0);
-                        String statusName = statusmxMap.get(new Double(aDouble).intValue());
+                        String statusName = statusmxMap.get(aDouble.intValue());
                         proEconWindturbineStatus2.setStatusDesc(statusName);
                         resultList.add(proEconWindturbineStatus2);
 //                    proEconWindturbineStatus2Service.save(proEconWindturbineStatus2);
@@ -145,10 +145,10 @@ public class RealtimeService {
                             proEconWindturbineStatus2.setLossPower(0.0);
                             proEconWindturbineStatus2.setShutdownEventId("");
                             proEconWindturbineStatus2.setProjectId(wt.getProjectid());
-                            proEconWindturbineStatus2.setSatusCode(new Double(aDouble).intValue());
+                            proEconWindturbineStatus2.setSatusCode(aDouble.intValue());
                             proEconWindturbineStatus2.setSpeed(speed);
                             proEconWindturbineStatus2.setAvgSpeed(0.0);
-                            String statusName = statusmxMap.get(new Double(aDouble).intValue());
+                            String statusName = statusmxMap.get(aDouble.intValue());
                             proEconWindturbineStatus2.setStatusDesc(statusName);
                             resultList.add(proEconWindturbineStatus2);
 //                        proEconWindturbineStatus2Service.save(proEconWindturbineStatus2);