From fe82f1f9a9be911d1420fe3b018ea85dd5fff1a3 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 21 十一月 2024 21:22:58 +0800
Subject: [PATCH] 代码整理
---
collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java b/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java
index 21800ca..cfbba4d 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/config/MqttConfig.java
@@ -24,7 +24,6 @@
import com.alibaba.fastjson.JSONObject;
import com.qianwen.mdc.collect.service.DeviceStateFixPointService;
import com.qianwen.mdc.collect.service.IOTMqttReceiveService;
-import com.qianwen.mdc.collect.service.WorkstationAppMappingService;
import com.qianwen.mdc.collect.service.WorkstationDatapointsService;
import com.qianwen.mdc.collect.service.feedback.WorkstationFeedbackService;
@@ -42,14 +41,16 @@
@Value("${mqtt.password:}")
private String mqttPassword;
+
+ @Value("${mqtt.timeout:1000}")
+ private int timeout;
+
@Autowired
private IOTMqttReceiveService recService;
@Autowired
private DeviceStateFixPointService stateFixPointService;
@Autowired
private WorkstationFeedbackService workstationFeedbackService;
- @Autowired
- private WorkstationAppMappingService workstationAppMappingService;
@Autowired
private WorkstationDatapointsService dpService;
@@ -64,6 +65,9 @@
*/
public static final String FEEDBACK_TOPIC = "mdc/feedback";
+ /**
+ * 宸ヤ綅鍒涘缓娑堟伅锛宮dc涓柊寤哄伐浣嶆椂鍙戦�侊紝鏈簲鐢ㄦ帴鏀跺苟澶勭悊
+ */
public static final String WOCKSTATION_CREATE_TOPIC = "mdc/workstation-create";
/**
@@ -76,6 +80,7 @@
DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
MqttConnectOptions options = new MqttConnectOptions();
options.setServerURIs(new String[] { mqttHost});//"tcp://82.156.1.83:1884"
+ options.setConnectionTimeout(timeout);
if(ObjectUtil.isNotEmpty(mqttUserName)) {
options.setUserName(mqttUserName);
@@ -134,11 +139,10 @@
}else if(WORKSTATION_DATAPOINT_CHANGED_TOPIC.equals(topic)) {
String payload = (String)message.getPayload();
logger.info("宸ヤ綅appId鏄犲皠鍙樺寲娑堟伅={}",payload);
- workstationAppMappingService.saveToCache();
+ //workstationAppMappingService.saveToCache();
//娓呴櫎璇ュ伐浣嶇殑鏁版嵁鐐圭紦瀛�
JSONObject payloadObj = JSONObject.parseObject(payload);
//payloadObj.getLong("workstationId");
-
dpService.datapointsCacheEvict(payloadObj.getString("appId"));
} else {//璁㈤槄浜嗗嚑涓猼opic灏变細鎺ユ敹鍒板嚑涓紝鍏朵粬鐨勪笉浼氳繘鏉�
logger.warn("topic={},msg={},鏃犲搴旂殑澶勭悊鍣�",topic,message.getPayload());
--
Gitblit v1.9.3