From d06c577a634528b11bc4b83c2769f48992913cad Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 十月 2023 09:07:30 +0800
Subject: [PATCH] 修复bug
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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 039276b..8a8f01e 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
@@ -1,6 +1,7 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.doumee.core.constants.Constants;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.mqtt.config.MqttConfig;
@@ -36,20 +37,31 @@
@Autowired
private MqttConfig mqttConfig;
@Override
- public void listener(String param,String topic) {
+ 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.lockInfo.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;
+ }
+ MqttLog mqttLog = new MqttLog();
+ mqttLog.setMsgId(msgId);
+ int msgCount =mqttLogMapper.selectCount(new QueryWrapper<MqttLog>().lambda().eq(MqttLog::getMsg, param).eq(MqttLog::getType, Constants.ZERO));
+ if(msgCount>0){
+ log.error("mqtt娑堟伅璁㈤槄==============宸叉秷璐规暟鎹�====="+param);
return;
}
String logId =Constants.getUUID();
@@ -59,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娑堟伅璁㈤槄閿佸ご淇℃伅";
@@ -70,23 +83,25 @@
JSONObject pjson = JSONObject.parseObject(param);
MemberRides bikes = new MemberRides();
bikes.setBikeCode(pjson.getString("bikeCode"));
- bikes.setBackLockId( pjson.getString("lockId"));
- bikes.setBackLockId( 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,logId,result,param,logInfo);
+ createSubLog(topic,msgId,logId,result,param,logInfo);
}
- private void createSubLog(String topic, String logId, int result,String param,String info) {
+ private void createSubLog(String topic, String msgId,String logId, int result,String param,String info) {
MqttLog log = new MqttLog();
log.setId(logId);
log.setCreateDate(new Date());
@@ -98,6 +113,8 @@
log.setType(Constants.ZERO);
log.setMsg(param);
log.setInfo(info);
+ log.setIsdeleted(Constants.ZERO);
+ log.setMsgId(msgId);
mqttLogMapper.insert(log);
}
private String getLockIdFromTopic(String topic) {
--
Gitblit v1.9.3