1

generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -1394,6 +1394,9 @@ public class WindPowerInfo1Service {
     }
 
 
+    /**
+     * 执行时间：00:00:00,04:00:00,08:00:00,12:00:00,16:00:00,20:00:00,
+     */
     public void writeReport1(Date date) throws Exception {
         String[] split = repInfo1.split(",");
         List<String> ls = new ArrayList<>(Arrays.asList(split));
@@ -1465,6 +1468,10 @@ public class WindPowerInfo1Service {
 
     }
 
+
+    /**
+     * 执行时间：01:00:00,05:00:00,09:00:00,13:00:00,17:00:00,21:00:00,
+     */
     public void writeReport2(Date date) throws Exception {
         String[] split = repInfo2.split(",");
         List<String> ls = new ArrayList<>(Arrays.asList(split));

generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -774,7 +774,7 @@ public class EdosUtil implements IEdosUtil {
                     // 获得key
                     String key = sIterator.next();
                     PointData pointData = pointDataHashMap.get(key);
-                    if (pointData == null||null==pointData.getPointTime())
+                    if (pointData == null)
                         continue;
                     // 根据key获得value, value也可以是JSONObject,JSONArray,使用对应的参数接收即可
                     JSONObject jsonData = jsonObject.getJSONObject(key);