Bladeren bron

移植智能检修首页接口

shilin 3 jaren geleden
bovenliggende
commit
4530daac2b

+ 3 - 3
realtime/datatraining-server-cph/src/main/java/com/gyee/datatraining/service/DatatrainingService.java

@@ -512,10 +512,10 @@ public class DatatrainingService {
             if (wtpAimap.containsKey(up82_part_state_clx)) {
                 Windturbinetestingpointnew ai = wtpAimap.get(up82_part_state_clx);
                 PointData point = new PointData();
-                point.setEdnaId(ai.getId());
+                point.setEdnaId(ai.getCode());
                 point.setPointValueInDouble(value);
                 point.setPointTime(new BigDecimal(now.getTime()).divide(new BigDecimal(1000), 0, RoundingMode.HALF_EVEN).longValue());
-                ednaApiUtil.updatePoint(point);
+                ednaApiUtil.sendSinglePoint(point);
             }
         }
         catch (Exception e)
@@ -531,7 +531,7 @@ public class DatatrainingService {
             point.setEdnaId(ai.getCode());
             point.setPointValueInDouble(value);
             point.setPointTime(new BigDecimal(now.getTime()).divide(new BigDecimal(1000), 0, RoundingMode.HALF_EVEN).longValue());
-            ednaApiUtil.updatePoint(point);
+            ednaApiUtil.sendSinglePoint(point);
         }
     }
 

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

@@ -2,8 +2,9 @@
 gyee:
   #实时数据库Url
   #baseurl: http://10.0.118.73:8011/ts
-  baseurl: http://123.60.213.70:8011/ts
+  #baseurl: http://123.60.213.70:8011/ts
   #baseurl: http://192.168.2.205:8011/ts
+  baseurl: http://192.168.2.198:8011/ts
   #实时数据库选择
   realtimedataBase: mongodb #数据查询模式 golden、hwy
   initialcode: INITIAL
@@ -26,15 +27,16 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    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:@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: nxfdprod
-    password: gdnxfd123
+    #url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    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

+ 1 - 1
realtime/datatraining-server-cph/src/main/resources/xxl-job-executor.properties

@@ -1,5 +1,5 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://192.168.56.1:8175/xxl-job-admin
+xxl.job.admin.addresses=http://192.168.2.198:8175/xxl-job-admin
 
 ### xxl-job, access token
 xxl.job.accessToken=