From c1a2d61c91cc28dec10d03f8735a4cf28add3b79 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 10:40:49 +0800
Subject: [PATCH] 开发
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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 fe881db..039276b 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
@@ -14,6 +14,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@@ -28,6 +29,7 @@
@Slf4j
public class DeviceSubscribeServiceImpl implements DeviceSubcribeService {
@Autowired
+ @Lazy
MemberRidesService memberRidesService;
@Autowired
private MqttLogMapper mqttLogMapper;
@@ -54,31 +56,32 @@
String logInfo = "";
int result =0;
try {
-
if(StringUtils.contains(topic, info)){
//濡傛灉閿佸ご淇℃伅涓婃姤
Locks locks = JSONObject.parseObject(param, Locks.class);
locks.setId(lockid);
locks.setInfo(logId);
result = memberRidesService.mqttLockInfoEvent(locks);
- logInfo = "涓婃姤閿佸ご淇℃伅";
+ logInfo = "mqtt娑堟伅璁㈤槄閿佸ご淇℃伅";
log.info("mqtt娑堟伅璁㈤槄=========閿佷俊鎭�==========鎴愬姛");
}
if(StringUtils.contains(topic, closeLock)){
//濡傛灉杩樿溅涓婃姤
JSONObject pjson = JSONObject.parseObject(param);
- String bikeCode = pjson.getString("bikeCode");
MemberRides bikes = new MemberRides();
- bikes.setBikeCode(bikeCode);
- bikes.setBackLockId(lockid);
+ bikes.setBikeCode(pjson.getString("bikeCode"));
+ bikes.setBackLockId( pjson.getString("lockId"));
+ bikes.setBackLockId( pjson.getString("siteId"));
bikes.setBackCommondId(logId);
result = memberRidesService.mqttCloseBikeEvent(bikes);
- logInfo = "涓婃姤杩樿溅娑堟伅";
+ logInfo = "mqtt娑堟伅璁㈤槄杩樿溅娑堟伅";
log.info("mqtt娑堟伅璁㈤槄=========杩樿溅==========鎴愬姛");
}
}catch (BusinessException e){
+ logInfo = "mqtt娑堟伅璁㈤槄閿欒==="+e.getMessage();
result =1;
}catch (Exception e){
+ logInfo = "mqtt娑堟伅璁㈤槄寮傚父===";
result =1;
}
createSubLog(topic,logId,result,param,logInfo);
@@ -98,8 +101,13 @@
mqttLogMapper.insert(log);
}
private String getLockIdFromTopic(String topic) {
- topic = topic.substring(0,topic.lastIndexOf("/"));
- String id = topic.substring( topic.lastIndexOf("/")+1);
- return id;
+ String[] ss = topic.split("/");
+ if(ss.length>2){
+ return ss[ss.length-2];
+ }
+ return null;
+// topic = topic.substring(0,topic.lastIndexOf("/"));
+// String id = topic.substring( topic.lastIndexOf("/")+1);
+// return id;
}
}
--
Gitblit v1.9.3