From 50c6151c164d8d6bd4d052257c75ba424883fecb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十月 2023 12:02:55 +0800
Subject: [PATCH] mqtt
---
server/services/src/main/java/com/doumee/service/business/impl/DeviceSubscribeServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 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 039276b..a34dbae 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,10 +37,10 @@
@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 closeLock = Constants.MqttTopic.closeLock.substring(Constants.MqttTopic.closeLock.lastIndexOf("/")+1) ;
if(topic.indexOf(Constants.MqttTopic.topic_index)!=0
|| (!StringUtils.contains(topic, info)
&&!StringUtils.contains(topic,closeLock))){
@@ -50,6 +51,12 @@
if(StringUtils.isBlank(lockid)){
//濡傛灉閿佸ご缂栫爜涓虹┖
log.error("mqtt娑堟伅璁㈤槄==============鏃犳晥鏁版嵁====="+param);
+ return;
+ }
+ MqttLog mqttLog = new MqttLog();
+ mqttLog.setMsgId(msgId);
+ if(mqttLogMapper.selectCount(new QueryWrapper<MqttLog>().lambda().eq(MqttLog::getMsgId, msgId)) >0){
+ log.error("mqtt娑堟伅璁㈤槄==============宸叉秷璐规暟鎹�====="+param);
return;
}
String logId =Constants.getUUID();
@@ -71,7 +78,7 @@
MemberRides bikes = new MemberRides();
bikes.setBikeCode(pjson.getString("bikeCode"));
bikes.setBackLockId( pjson.getString("lockId"));
- bikes.setBackLockId( pjson.getString("siteId"));
+ bikes.setBackSiteId( pjson.getString("siteId"));
bikes.setBackCommondId(logId);
result = memberRidesService.mqttCloseBikeEvent(bikes);
logInfo = "mqtt娑堟伅璁㈤槄杩樿溅娑堟伅";
@@ -84,9 +91,9 @@
logInfo = "mqtt娑堟伅璁㈤槄寮傚父===";
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 +105,7 @@
log.setType(Constants.ZERO);
log.setMsg(param);
log.setInfo(info);
+ log.setMsgId(msgId);
mqttLogMapper.insert(log);
}
private String getLockIdFromTopic(String topic) {
--
Gitblit v1.9.3