监视模块产品化计算服务修改

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WindPowerstationTestingPoint2Service.java

@@ -141,7 +141,7 @@ public class WindPowerstationTestingPoint2Service implements BaseService<WindPow
 	}
 
 	public WindPowerStationTestingPoint getWindPowerStationTestingPoint2(String wpId, String unicode)  {
-		WindPowerStationTestingPoint point=null;
+		WindPowerStationTestingPoint point=new WindPowerStationTestingPoint();
 
 		if(StringUtils.notEmp(wpId) && StringUtils.notEmp(unicode) )
 		{

web/monitor-web-hb/src/main/java/com/gyee/frame/service/WindTurbineTestingPointAiService.java

@@ -142,7 +142,7 @@ public class WindTurbineTestingPointAiService implements BaseService<WindTurbine
 
 	public WindTurbineTestingPointAi getWindTurbineTestingPointAi2(String wtId, String unicode)  {
 
-		WindTurbineTestingPointAi point=null;
+		WindTurbineTestingPointAi point=new WindTurbineTestingPointAi();
 		if(StringUtils.notEmp(wtId) && StringUtils.notEmp(unicode) )
 		{
 			 if(InitialRunner.wtmap.containsKey(wtId))

web/monitor-web-hb/src/main/java/com/gyee/frame/service/goodness/WindturbinegoodnessService.java

@@ -120,73 +120,84 @@ public class WindturbinegoodnessService {
 
         if (null != sjgl) {
             List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
-            int count = 0;
-            double temp = 0;
-            for (int i = 0; i < vos.size(); i++) {
-                vos.get(i).setTime(sjglls.get(i ).getPointTime() * 1000);
+            if(!sjglls.isEmpty())
+            {
+                int count = 0;
+                double temp = 0;
+                for (int i = 0; i < vos.size(); i++) {
+                    vos.get(i).setTime(sjglls.get(i ).getPointTime() * 1000);
+
+                    if (i < sjglls.size() && StringUtils.notEmp(sjglls.get(i ).getPointTime())) {
 
-                if (i < sjglls.size() && StringUtils.notEmp(sjglls.get(i ).getPointTime())) {
+                        if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
+                            temp = sjglls.get(i ).getPointValueInDouble();
+                            if (Math.abs(temp) < 10000) {
+                                vos.get(i).setValue1(StringUtils.round(temp, 2));// 实际功率
+                            }
 
-                    if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
-                        temp = sjglls.get(i ).getPointValueInDouble();
-                        if (Math.abs(temp) < 10000) {
-                            vos.get(i).setValue1(StringUtils.round(temp, 2));// 实际功率
+                            count++;
+                        } else {
+                            vos.get(i).setValue1(0d);// 实际功率
                         }
 
-                        count++;
-                    } else {
-                        vos.get(i).setValue1(0d);// 实际功率
                     }
-
                 }
             }
 
+
         }
 
         if (null != bzgl) {
             List<PointData> bzglls = realApiUtil.getHistoryDatasSnap(bzgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
-            int count = 0;
-            double temp = 0;
-            for (int i = 0; i < vos.size(); i++) {
-                // vos.get(i).setTime(bzglls.get(i).getPointTime() * 1000);
-                if (i < bzglls.size() && StringUtils.notEmp(bzglls.get(i ).getPointTime())) {
-
-                    if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
-                        temp = bzglls.get(i ).getPointValueInDouble();
-                        if (Math.abs(temp) < 10000) {
-                            vos.get(i).setValue2(StringUtils.round(temp, 2));// 保证功率
+            if(!bzglls.isEmpty())
+            {
+                int count = 0;
+                double temp = 0;
+                for (int i = 0; i < vos.size(); i++) {
+                    // vos.get(i).setTime(bzglls.get(i).getPointTime() * 1000);
+                    if (i < bzglls.size() && StringUtils.notEmp(bzglls.get(i ).getPointTime())) {
+
+                        if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
+                            temp = bzglls.get(i ).getPointValueInDouble();
+                            if (Math.abs(temp) < 10000) {
+                                vos.get(i).setValue2(StringUtils.round(temp, 2));// 保证功率
+                            }
+
+                            count++;
+                        } else {
+                            vos.get(i).setValue2(0d);// 保证功率
                         }
 
-                        count++;
-                    } else {
-                        vos.get(i).setValue2(0d);// 保证功率
                     }
-
                 }
             }
 
+
         }
 
         if (null != pjfs) {
             List<PointData> pjfsls = realApiUtil.getHistoryDatasSnap(pjfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, (long) length, 3600L);
+            if(!pjfsls.isEmpty())
+            {
+                int count = 0;
+                double temp = 0;
+                for (int i = 0; i < vos.size(); i++) {
+                    vos.get(i).setTime(pjfsls.get(i ).getPointTime() * 1000);
+                    if (i < pjfsls.size() && StringUtils.notEmp(pjfsls.get(i ).getPointTime())) {
 
-            int count = 0;
-            double temp = 0;
-            for (int i = 0; i < vos.size(); i++) {
-                vos.get(i).setTime(pjfsls.get(i ).getPointTime() * 1000);
-                if (i < pjfsls.size() && StringUtils.notEmp(pjfsls.get(i ).getPointTime())) {
-
-                    if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
-                        temp = pjfsls.get(i ).getPointValueInDouble();
-                        vos.get(i).setValue3(StringUtils.round(temp, 2));// 风速
-                        count++;
-                    } else {
-                        vos.get(i).setValue3(0d);// 实际功率
-                    }
+                        if (vos.get(i).getTime() <= DateUtils.now().getTime()) {
+                            temp = pjfsls.get(i ).getPointValueInDouble();
+                            vos.get(i).setValue3(StringUtils.round(temp, 2));// 风速
+                            count++;
+                        } else {
+                            vos.get(i).setValue3(0d);// 实际功率
+                        }
 
+                    }
                 }
             }
 
+
         }
 
         // if (null != fjzt) {

web/monitor-web-hb/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -350,6 +350,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     public List<PointData> getHistoryDatasSnap(WindTurbineTestingPointAi point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+
         if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getId()))
         {
             Optional<String> tagName = Optional.ofNullable(point.getId());