ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
chendaofei
2025-07-11 09:24:08 +08:00
parent 0e056a7de1
commit 9a4ef6abb5
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

21
event_smart/src/main/resources/application.yml
View File

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