From 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 18:35:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/DeviceService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 e037a77..aaf5079 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
@@ -1,6 +1,7 @@
package com.doumee.service.business;
import com.doumee.dao.business.model.Locks;
+import com.doumee.dao.business.model.MqttLog;
/**
* 涓庣‖浠跺鎺ユ湇鍔�
@@ -14,7 +15,9 @@
* 涓嬪彂寮�杞﹀紑閿佹寚浠�
* @return String
*/
- boolean openLock(Locks locks);
- void startSubcribe();
+ MqttLog openLock(Locks locks);
+ MqttLog getLockInfo(Locks locks);
+
+ void testPush(String topic, String json);
}
--
Gitblit v1.9.3