From eb2d3ef0e4fa144d5a76823709a1ab2bc27a2ae9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 七月 2025 17:42:34 +0800
Subject: [PATCH] 1、通信中间件去除上报消息测试类（去除注解） ; 2、remote模块，webSocket模块修改完善，增加机构orgTag控制； 3、从SSO模块获取当前用户信息部分进行集成完善，以供其他部分共享应用。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
index 49d25ec..c4f0771 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
@@ -481,10 +481,8 @@
ServerProperties.mqttAcceptDataMinInterval = conf.getSetAttrPlusInt(doc, "config.mqtt", "acceptDataMinInterval", null, 1, 720, null) * 60 * 1000L ;
mqVo.useMemoryPersistence = conf.getSetAttrBoolean(doc, "config.mqtt", "useMemoryPersistence", null, null) ;
- String proAndDevIds = conf.getSetAttrTxt(doc, "config.mqtt", "protocolAndDeviceIds", null, false, null) ;
- if(proAndDevIds == null || proAndDevIds.trim().equals("")){
- throw new Exception("config.mqtt.protocolAndDeviceIds閰嶇疆涓嶅悎娉�") ;
- }else{
+ String proAndDevIds = conf.getSetAttrTxt(doc, "config.mqtt", "protocolAndDeviceIds", null, true, null) ;
+ if(proAndDevIds != null && !proAndDevIds.trim().equals("")){
proAndDevIds = proAndDevIds.trim() ;
proAndDevIds = proAndDevIds.replaceAll("锛�", ",");
proAndDevIds = proAndDevIds.replaceAll("锛�", ";");
@@ -499,11 +497,8 @@
}
}
-
- String subTopicAndQos = conf.getSetAttrTxt(doc, "config.mqtt", "subTopicAndQos", null, false, null) ;
- if(subTopicAndQos == null || subTopicAndQos.trim().equals("")){
- throw new Exception("config.mqtt.subTopicAndQos閰嶇疆鐨勪富棰樺強Qos涓嶅悎娉�") ;
- }else{
+ String subTopicAndQos = conf.getSetAttrTxt(doc, "config.mqtt", "subTopicAndQos", null, true, null) ;
+ if(subTopicAndQos != null && !subTopicAndQos.trim().equals("")){
subTopicAndQos = subTopicAndQos.trim() ;
subTopicAndQos = subTopicAndQos.replaceAll("锛�", ",");
subTopicAndQos = subTopicAndQos.replaceAll("锛�", ";");
--
Gitblit v1.8.0