修正装机容量初始值和报警信息非空验证

web/analysis-hb/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -82,7 +82,7 @@ public class GenreSetPushService {
         if (StringUtils.notEmp(id)) {
 
 
-            Double zjrl = 0.0;
+            Double zjrl = 1.0;
             Double zjts = 0.0;
 
             Double sjgl = 0.0;

web/analysis-hb/src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -116,7 +116,7 @@ public class WpInfoPushService {
 
             String id = wp.getId();
             double scadafdl = 0.0;
-            Double zjrl = 0.0;
+            Double zjrl = 1.0;
             Double zjts = 0.0;
 
             Double sjgl = 0.0;
@@ -1157,7 +1157,7 @@ public class WpInfoPushService {
             Map<String, Object> jczbmap = new HashMap<String, Object>();
             String id = wp.getId();
 
-            Double zjrl = 0.0;
+            Double zjrl = 1.0;
             Double zjts = 0.0;
 
             Double sjgl = 0.0;

web/analysis-hb/src/main/resources/application-dev.yml

@@ -11,14 +11,14 @@ spring:
         #        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
         #        username: root
         #        password: 123456
-        url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
-        #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+        #url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+        url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
         #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
         #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-        #        username: gdprod
-        #        password: gd123
-        username: nxfdprod
-        password: gdnxfd123
+        username: gdprod
+        password: gd123
+        #        username: nxfdprod
+        #        password: gdnxfd123
         driver-class-name: oracle.jdbc.driver.OracleDriver
       #        url: jdbc:postgresql://10.81.3.151:5432/wisdom
       #        username: gdprod
@@ -32,13 +32,13 @@ spring:
         password: root
         #两票数据源
       ticket:
-        url: jdbc:sqlserver://123.60.213.70:1434;DatabaseName=fdeam
-        #url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew
+        #url: jdbc:sqlserver://123.60.213.70:1434;DatabaseName=fdeam
+        url: jdbc:sqlserver://192.168.2.200:1434;DatabaseName=fdeamnew
         #url: jdbc:sqlserver://10.83.68.98:1434;DatabaseName=fdeamnew
         #url: jdbc:sqlserver://10.0.118.71:1433;DatabaseName=fdeamnew
         username: sa
-        #password: ibs
-        password: Gyee@321#!
+        password: ibs
+        #password: Gyee@321#!
         #password: Gd!123456
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
         #配置初始化连接数大小

web/analysis-hb/src/main/resources/application.yml

@@ -28,16 +28,16 @@ gyee:
   #实时数据库Url
   #baseurl: http://10.0.118.73:8011/ts
   #baseurl: http://10.83.68.97:8011/ts
-  #baseurl: http://192.168.2.216:8011/ts
-  baseurl: http://123.60.213.70:8011/ts
+  baseurl: http://192.168.2.216:8011/ts
+  #baseurl: http://123.60.213.70:8011/ts
   #API访问ip
   #swaggerip: 49.4.50.80:8082
   swaggerip: 10.155.32.4:8082
   #默认小数位数
   digit: 2
   realtimedataBase: golden #数据查询模式 golden、hwy
-  weatherurl: http://123.60.213.70:7011
-  #weatherurl: http://192.168.2.216:7011
+  #weatherurl: http://123.60.213.70:7011
+  weatherurl: http://192.168.2.216:7011
   #weatherurl: http://10.83.68.97:7011
   weatherqygs: hb_qygs
   hbmaps: {CL_FDC_KEY: 2003,KB_FDC_KEY: 1460,DX_FDC_KEY: 2186,SY_FDC_KEY: 1366}
@@ -67,8 +67,8 @@ spring :
     cloud:
       nacos:
         discovery:
-          server-addr: 192.168.56.1:8848
-          #server-addr: 192.168.2.216:8848
+          #server-addr: 192.168.56.1:8848
+          server-addr: 192.168.2.216:8848
           #server-addr: 10.83.68.97:8848
           #指定yaml格式的配置
           file-extension: yaml
@@ -97,12 +97,12 @@ spring :
       exclude: test/**
 
   redis:
-    database: 1
-    #host: 192.168.2.202
+    database: 19
+    host: 192.168.2.202
     #host: 10.83.68.94
     #host: 10.0.118.73
-    host: 123.60.213.70
-    password: gdnxfd123
+    #host: 123.60.213.70
+    password:
     pool:
       maxTotal: 20
       maxIdle: 20