健康推荐计算服务

realtime/datatraining-server-cph/src/main/java/com/gyee/datatraining/util/realtimesource/EdosUtil.java

@@ -635,8 +635,8 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
                             if (pointDataHashMap.containsKey(pointids[i]) == false){
                                 PointData pd = new PointData();
-                                pd.setPointName(idls.get(i));
-                                pd.setEdnaId(idls.get(i));
+                                pd.setPointName(pointids[i]);
+                                pd.setEdnaId(pointids[i]);
                                 pd.setPointValueInDouble(0.0);
                                 pd.setPointTime(0l);
                                 result.add(pd);
@@ -644,7 +644,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                 pointDataHashMap.put(pd.getPointName(), pd);
                             }
                             else{
-                                result.add(pointDataHashMap.get(idls.get(i)));
+                                result.add(pointDataHashMap.get(pointids[i]));
                             }
 
                         }
@@ -776,8 +776,8 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
                             if (pointDataHashMap.containsKey(pointids.get(i)) == false){
                                 PointData pd = new PointData();
-                                pd.setPointName(idls.get(i));
-                                pd.setEdnaId(idls.get(i));
+                                pd.setPointName(pointids.get(i));
+                                pd.setEdnaId(pointids.get(i));
                                 pd.setPointValueInDouble(0.0);
                                 pd.setPointTime(0l);
                                 result.add(pd);
@@ -785,7 +785,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                                 pointDataHashMap.put(pd.getPointName(), pd);
                             }
                             else{
-                                result.add(pointDataHashMap.get(idls.get(i)));
+                                result.add(pointDataHashMap.get(pointids.get(i)));
                             }
                         }
                         Iterator<String> sIterator = jsonObject.keySet().iterator();

realtime/datatraining-server-cph/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 # 项目相关配置
 gyee:
   #实时数据库Url
-  baseurl: http://10.0.118.73:8011/ts
   #baseurl: http://10.0.118.73:8011/ts
+  baseurl: http://123.60.213.70:8011/ts
   #baseurl: http://192.168.2.205:8011/ts
   #实时数据库选择
   realtimedataBase: mongodb #数据查询模式 golden、hwy
@@ -26,12 +26,15 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
     #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
     #    url: jdbc:oracle:thin:@49.4.50.80:1521:gdnxfd
     #    url: jdbc:oracle:thin:@172.168.1.14:1521:gdnxfd
-    username: gdprod
-    password: gd123
+#    username: gdprod
+#    password: gd123
+    username: nxfdprod
+    password: gdnxfd123
     oracle-schema=:
     #    type: com.alibaba.druid.pool.DruidDataSource
     #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC