From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/service/business/MemberRidesService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
index 985fd51..c9ec41d 100644
--- a/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
+++ b/server/services/src/main/java/com/doumee/service/business/MemberRidesService.java
@@ -2,6 +2,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.Bikes;
+import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
@@ -114,7 +116,7 @@
* @param memberId
* @return
*/
- String getOnlineBike(String memberId);
+ MemberRides getOnlineBike(String memberId);
/**
* 鎵爜瑙ｉ攣
@@ -133,4 +135,8 @@
void updateDuration(MemberRides memberRides);
void forceBack(MemberRides memberRides);
+
+ int mqttCloseBikeEvent(MemberRides bikes);
+
+ int mqttLockInfoEvent(Locks locks);
}
--
Gitblit v1.9.3