Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

 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,30 @@
    @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);
        if(mqttLogMapper.selectCount(new QueryWrapper<MqttLog>().lambda().eq(MqttLog::getMsgId, msgId)) >0){
            log.error("mqtt消息订阅==============已消费数据====="+param);
            return;
        }
        String logId =Constants.getUUID();
@@ -71,7 +82,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 +95,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 +109,7 @@
        log.setType(Constants.ZERO);
        log.setMsg(param);
        log.setInfo(info);
        log.setMsgId(msgId);
        mqttLogMapper.insert(log);
    }
    private String getLockIdFromTopic(String topic) {