From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
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 bae593e..1383d8a 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
@@ -9,6 +9,7 @@
import com.doumee.dao.business.model.MqttLog;
import com.doumee.service.business.DeviceService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import java.util.Date;
@@ -26,12 +27,6 @@
private MqttLogMapper mqttLogMapper;
@Autowired
private MqttConfig mqttConfig;
- @Override
- @PostConstruct
- public void startSubcribe() {
- mqttToolService.subscribe(new String[]{ Constants.MqttTopic.openLock, Constants.MqttTopic.closeLock});
- }
-
/**
* 鍙戣捣寮�閿佹寚浠�
* @param locks
@@ -39,7 +34,7 @@
*/
@Override
public MqttLog openLock(Locks locks) {
- String topic = Constants.MqttTopic.openLock.replace("+", locks.getId());
+ String topic = Constants.MqttTopic.pub_openLock.replace("+", locks.getId());
int result = mqttToolService.pubMessage("{}",topic);
MqttLog mqttLog = createPushLog(topic,result,"璇锋眰寮�閿乢"+locks.getId());
return mqttLog;
@@ -51,11 +46,16 @@
*/
@Override
public MqttLog getLockInfo(Locks locks) {
- String topic = Constants.MqttTopic.getLockInfo.replace("+", locks.getId());
+ String topic = Constants.MqttTopic.pub_getLockInfo.replace("+", locks.getId());
int result = mqttToolService.pubMessage("{}",topic);
MqttLog mqttLog = createPushLog(topic,result,"瀹炴椂鏌ヨ閿佷俊鎭痏"+locks.getId());
return mqttLog;
}
+ @Override
+ @Async
+ public void testPush(String topic, String json){
+ int result = mqttToolService.pubMessage(json,topic);
+ }
private MqttLog createPushLog(String topic, int result,String info) {
MqttLog log = new MqttLog();
--
Gitblit v1.9.3