From f46cdb919bc12c48b13d3b4e595dc136ee987358 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 09 十月 2023 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/DeviceService.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/DeviceService.java b/server/services/src/main/java/com/doumee/service/business/DeviceService.java
index 8af85d9..e037a77 100644
--- a/server/services/src/main/java/com/doumee/service/business/DeviceService.java
+++ b/server/services/src/main/java/com/doumee/service/business/DeviceService.java
@@ -14,7 +14,7 @@
* 涓嬪彂寮�杞﹀紑閿佹寚浠�
* @return String
*/
- String openLock(Locks locks);
+ boolean openLock(Locks locks);
void startSubcribe();
}
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 64cf5ed..d007c15 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
@@ -27,9 +27,9 @@
mqttToolService.subscribe(new String[]{ Constants.MqttTopic.openLock, Constants.MqttTopic.closeLock});
}
@Override
- public String openLock(Locks locks) {
+ public boolean openLock(Locks locks) {
mqttToolService.pubMessage(locks.getName(), Constants.MqttTopic.openLock);
- return null;
+ return true;
}
}
--
Gitblit v1.9.3