From 0e6c8463c32099a300b94567f2656bb363acd502 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 十月 2023 10:53:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
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 a34dbae..75517d7 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
@@ -39,16 +39,20 @@
@Override
public void listener(String msgId,String param,String topic) {
log.info("mqtt娑堟伅璁㈤槄==================="+param);
- String info = Constants.MqttTopic.lockInfo.substring(Constants.MqttTopic.lockInfo.lastIndexOf("/")+1) ;
- String closeLock = Constants.MqttTopic.closeLock.substring(Constants.MqttTopic.closeLock.lastIndexOf("/")+1) ;
+ String info = Constants.MqttTopic.sub_lockInfo.substring(Constants.MqttTopic.sub_lockInfo.lastIndexOf("/")+1) ;
+ String closeLock = Constants.MqttTopic.sub_closeLock.substring(Constants.MqttTopic.sub_closeLock.lastIndexOf("/")+1) ;
if(topic.indexOf(Constants.MqttTopic.topic_index)!=0
+ ||topic.split("/").length < 5
|| (!StringUtils.contains(topic, info)
&&!StringUtils.contains(topic,closeLock))){
log.error("mqtt娑堟伅璁㈤槄===========鏃犳晥鏁版嵁========"+param);
return;
}
- String lockid = getLockIdFromTopic(topic);
- if(StringUtils.isBlank(lockid)){
+
+ String[] ss = topic.split("/");
+ String siteid = ss[2];//绔欑偣缂栫爜
+ String lockid = ss[3];//閿佸ご缂栫爜
+ if(StringUtils.isBlank(siteid)||StringUtils.isBlank(lockid)){
//濡傛灉閿佸ご缂栫爜涓虹┖
log.error("mqtt娑堟伅璁㈤槄==============鏃犳晥鏁版嵁====="+param);
return;
@@ -66,7 +70,8 @@
if(StringUtils.contains(topic, info)){
//濡傛灉閿佸ご淇℃伅涓婃姤
Locks locks = JSONObject.parseObject(param, Locks.class);
- locks.setId(lockid);
+ locks.setSiteId(siteid);
+ locks.setCode(lockid);
locks.setInfo(logId);
result = memberRidesService.mqttLockInfoEvent(locks);
logInfo = "mqtt娑堟伅璁㈤槄閿佸ご淇℃伅";
@@ -77,8 +82,8 @@
JSONObject pjson = JSONObject.parseObject(param);
MemberRides bikes = new MemberRides();
bikes.setBikeCode(pjson.getString("bikeCode"));
- bikes.setBackLockId( pjson.getString("lockId"));
- bikes.setBackSiteId( pjson.getString("siteId"));
+ bikes.setBackLockId( lockid);
+ bikes.setBackSiteId( siteid);
bikes.setBackCommondId(logId);
result = memberRidesService.mqttCloseBikeEvent(bikes);
logInfo = "mqtt娑堟伅璁㈤槄杩樿溅娑堟伅";
--
Gitblit v1.9.3