调整

event_smart/src/main/java/com/njcn/gather/event/transientes/controller/EventGateController.java

@@ -90,15 +90,22 @@ public class EventGateController extends BaseController {
         JSONObject jsonObject;
         try {
             //下面一行代码正式环境需要放开
-            //jsonObject = new JSONObject(msg);
+            jsonObject = new JSONObject(msg);
             //下面一行代码正式环境需要放开
-            jsonObject = test();
+            //jsonObject = test();
 
             if (msgEventConfigService.getEventType().contains(jsonObject.get("wavetype").toString())) {
                 webSocketServer.sendMessageToAll(jsonObject.toString());
+
+                //开始发送短信
+                try {
+                    sendMessage(jsonObject);
+                }catch (Exception e){
+                    log.error("短信组装发送失败!失败原因{}",e.getMessage());
+                }
+
             }
-            //开始发送短信
-            sendMessage(jsonObject);
+
         } catch (Exception e) {
             log.error("暂降json格式异常!{}", e.getMessage());
         }
@@ -199,7 +206,7 @@ public class EventGateController extends BaseController {
     }
 
 
-    private void sendMessage(JSONObject jsonObject) {
+    private void sendMessage(JSONObject jsonObject) throws Exception{
         Integer lineId = Integer.valueOf(jsonObject.get("lineid").toString());
         List<PqsDeptsline> pqLineDept = pqsDeptslineService.lambdaQuery().eq(PqsDeptsline::getLineIndex, lineId).eq(PqsDeptsline::getSystype, sysTypeZt).list();
         Set<String> deptIds = pqLineDept.stream().map(PqsDeptsline::getDeptsIndex).collect(Collectors.toSet());

event_smart/src/main/resources/application.yml

@@ -31,9 +31,12 @@ spring:
         maxPoolPreparedStatementPerConnectionSize: 20
       datasource:
         master:
-          url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase
-          username: pqsadmin_bj
-          password: pqsadmin
+          #url: jdbc:oracle:thin:@192.168.1.51:1521:pqsbase
+          #username: pqsadmin_bj
+          #password: pqsadmin
+          url: jdbc:oracle:thin:@192.168.10.34:11521:pqsbase
+          username: pqsadmin
+          password: Pqsadmin_123
           driver-class-name: oracle.jdbc.driver.OracleDriver
 #        salve:
 #          driver-class-name: dm.jdbc.driver.DmDriver
@@ -67,12 +70,12 @@ db:
 #文件位置配置
 business:
   #处理波形数据位置
-  # wavePath: D://comtrade
-  wavePath: /usr/local/comtrade
+  wavePath: D://Comtrade
+  #wavePath: /usr/local/comtrade
   #处理临时数据
-  #tempPath: D://file
-  tempPath: /usr/local/file
-  #文件存储的方式
+  tempPath: D://file
+  #tempPath: /usr/local/file
+  #文件存储的方式 3.本地存储
   file:
     storage: 3
 #oss服务器配置
@@ -97,6 +100,6 @@ threadPool:
   maxPoolSize: 20
   queueCapacity: 500
   keepAliveSeconds: 60
-WAVEPATH: D:/comtrade
+WAVEPATH: D:/Comtrade