From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:40:34 +0800
Subject: [PATCH] #获取正常还车
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 e4cda85..1538fa1 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
@@ -59,7 +59,8 @@
}
MqttLog mqttLog = new MqttLog();
mqttLog.setMsgId(msgId);
- if(mqttLogMapper.selectCount(new QueryWrapper<MqttLog>().lambda().eq(MqttLog::getMsgId, msgId)) >0){
+ int msgCount =mqttLogMapper.selectCount(new QueryWrapper<MqttLog>().lambda().eq(MqttLog::getMsgId, msgId));
+ if(msgCount>0){
log.error("mqtt娑堟伅璁㈤槄==============宸叉秷璐规暟鎹�====="+param);
return;
}
@@ -70,7 +71,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娑堟伅璁㈤槄閿佸ご淇℃伅";
@@ -81,18 +83,20 @@
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娑堟伅璁㈤槄杩樿溅娑堟伅";
log.info("mqtt娑堟伅璁㈤槄=========杩樿溅==========鎴愬姛");
}
}catch (BusinessException e){
+ e.printStackTrace();
logInfo = "mqtt娑堟伅璁㈤槄閿欒==="+e.getMessage();
result =1;
}catch (Exception e){
- logInfo = "mqtt娑堟伅璁㈤槄寮傚父===";
+ e.printStackTrace();
+ logInfo = "mqtt娑堟伅璁㈤槄寮傚父==="+e.getMessage();
result =1;
}
createSubLog(topic,msgId,logId,result,param,logInfo);
@@ -109,6 +113,7 @@
log.setType(Constants.ZERO);
log.setMsg(param);
log.setInfo(info);
+ log.setIsdeleted(Constants.ZERO);
log.setMsgId(msgId);
mqttLogMapper.insert(log);
}
--
Gitblit v1.9.3