From 2370a9e4fa4ba347283bce66d18b843eeead3441 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十月 2023 10:43:14 +0800
Subject: [PATCH] bug
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 2 +-
server/services/src/main/resources/application-test.yml | 1 +
server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java | 6 ++----
server/services/src/main/java/com/doumee/core/mqtt/config/MqttConfig.java | 4 ++++
server/services/src/main/resources/application-dev.yml | 1 +
server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 4 ++--
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
index 8fe3750..7028dc9 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
@@ -18,8 +18,7 @@
}
try {
// host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
-// String clientId =config.getClientid()+ Constants.getUUID();
- String clientId =config.getClientid()+(int)(Math.random()*10000);
+ String clientId =config.getClientid() +config.getVersion();
client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
// MQTT鐨勮繛鎺ヨ缃�
MqttConnectOptions options = new MqttConnectOptions();
@@ -50,8 +49,7 @@
}
try {
// host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
-// String clientId =config.getClientid()+ Constants.getUUID();
- String clientId =config.getClientid()+(int)(Math.random()*10000);
+ String clientId =config.getSubclientid() +config.getVersion();
subClient = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), clientId,new MemoryPersistence());
// MQTT鐨勮繛鎺ヨ缃�
MqttConnectOptions options = new MqttConnectOptions();
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttConfig.java b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttConfig.java
index 6cbac72..22c407e 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttConfig.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttConfig.java
@@ -36,5 +36,9 @@
* 鎺堟潈瀵嗙爜
*/
private String password;
+ /**
+ * 瀹㈡埛绔増鏈悗缂�
+ */
+ private String version;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index 53e8af3..95421df 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -34,7 +34,7 @@
*/
@Override
public MqttLog openLock(Locks locks) {
- String topic = Constants.MqttTopic.pub_openLock.replace("+", locks.getId());
+ String topic = Constants.MqttTopic.pub_openLock.replace("{siteId}", locks.getSiteId()).replace("{lockId}", locks.getCode());
int result = mqttToolService.pubMessage("{}",topic);
MqttLog mqttLog = createPushLog(topic,result,"璇锋眰寮�閿乢"+locks.getId());
return mqttLog;
@@ -46,7 +46,7 @@
*/
@Override
public MqttLog getLockInfo(Locks locks) {
- String topic = Constants.MqttTopic.pub_getLockInfo.replace("+", locks.getId());
+ String topic = Constants.MqttTopic.pub_getLockInfo.replace("{siteId}", locks.getSiteId()).replace("{lockId}", locks.getCode());
int result = mqttToolService.pubMessage("{}",topic);
MqttLog mqttLog = createPushLog(topic,result,"瀹炴椂鏌ヨ閿佷俊鎭痏"+locks.getId());
return mqttLog;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
index 1538fa1..8a8f01e 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java
@@ -59,7 +59,7 @@
}
MqttLog mqttLog = new MqttLog();
mqttLog.setMsgId(msgId);
- int msgCount =mqttLogMapper.selectCount(new QueryWrapper<MqttLog>().lambda().eq(MqttLog::getMsgId, msgId));
+ int msgCount =mqttLogMapper.selectCount(new QueryWrapper<MqttLog>().lambda().eq(MqttLog::getMsg, param).eq(MqttLog::getType, Constants.ZERO));
if(msgCount>0){
log.error("mqtt娑堟伅璁㈤槄==============宸叉秷璐规暟鎹�====="+param);
return;
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 234cc6c..38a3e17 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -57,6 +57,7 @@
host: tcp://175.27.187.84:1883
username: doumee1
password: doumee@168
+ version: 001
tencent:
map:
diff --git a/server/services/src/main/resources/application-test.yml b/server/services/src/main/resources/application-test.yml
index 2725372..0d87a8c 100644
--- a/server/services/src/main/resources/application-test.yml
+++ b/server/services/src/main/resources/application-test.yml
@@ -57,6 +57,7 @@
host: tcp://175.27.187.84:1883
username: doumee1
password: doumee@168
+ version: 002
tencent:
map:
--
Gitblit v1.9.3