代码漏洞修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/config/MqttConfig.java

@@ -182,7 +182,6 @@ public class MqttConfig {
         // 可同时消费（订阅）多个Topic
         adapter = new MqttPahoMessageDrivenChannelAdapter(consumerClientId, mqttClientFactory(), StringUtils.split(defaultTopic, ","));
         adapter.setCompletionTimeout(5000);
-//        adapter.setConverter(new DefaultPahoMessageConverter());
         adapter.setQos(2);
 
         // 设置转换器，接收bytes
@@ -317,10 +316,6 @@ public class MqttConfig {
                     logger.warn(" 中断设备编码： " + codeNum);
                     TerminalRouter.routerMap.get("HxpTerminalService").offLine(codeNum);
                 } else if (receivedTopic.startsWith(steerPublishPrefix)) {
-//                    messageStr = byte2Hex(message.getPayload().toString().getBytes(StandardCharsets.UTF_8));
-//                    char[] str = message.getPayload().toString().toCharArray();
-
-
                     // 柜锁bit 位
                     long bit = CRCCHECK.getBitByCommand(messageStr);
                     // 1开锁状态 0关锁状态
@@ -328,40 +323,11 @@ public class MqttConfig {
                     logger.info("柜锁MQTT状态回调：" + receivedTopic.replaceAll(steerPublishPrefix +"/", "") + ":" + bit + "，回调结果" + (status == 1 ? "开启": "关闭") + "，指令：" + messageStr);
                     redisService.setCacheObject(receivedTopic.replaceAll(steerPublishPrefix +"/", "") + ":" + bit, status, 3 * 60L, TimeUnit.SECONDS);
 
-                    //坨机写指令返回数据
-                    /*String replaceMess = messageStr.replace(" ", "");
-                    if (replaceMess.length() == 12) {
-                        String command = replaceMess.substring(8, 10);
-                        //表示坨机成功
-                        if (HexUtils.hexToInteger(command) == 0) {
-                            // 成功逻辑、、
-                            Long lockId = Long.parseLong(HexUtils.hexToInteger(replaceMess.substring(4, 6)) + "");
-                            String[] prefix = steerPublishPrefix.split("/");
-                            if (prefix != null && prefix.length > 0) {
-                                // 采集器编号
-                                String relayCode = prefix[prefix.length - 1];
-                                TerminalRouter.routerMap.get("HxpLockService").onLine(relayCode + "/" + lockId);
-                            }
-                        }
-                        //坨机读指令返回数据，用于在线监测
-                    } else if (replaceMess.length() == 16) {
-//                        String command=replaceMess.substring(4,6);
-//                        Long lockId = Long.parseLong(HexUtils.hexToInteger(command) + "");
-                        String[] prefix = steerPublishPrefix.split("/");
-                        if (prefix != null && prefix.length > 0) {
-                            // 采集器编号
-                            String relayCode = prefix[prefix.length - 1];
-                            TerminalRouter.routerMap.get("HxpLockService").offLine(relayCode);
-                        }
-                    }*/
                 } else if (receivedTopic.startsWith(MqttConstants.TOPIC_FIRE_DEVICE_RECEIVE)) {
                     logger.info("消息处理器1开始处理=====");
                     logger.info("topic:" + receivedTopic);
                     ReturnMessageProcessing(message, receivedTopic);
                 }
-                //
-//                MessageBody messageBody = JSONObject.parseObject(messageStr, MessageBody.class);
-//                mqttResHandler.deal(JSONUtil.toBean(msg,com.ffy.mqtt.model.Message.class));
                 List<LabMessageEvent> labMessageEvents = labMessMap.get(receivedTopic);
                 if (CollUtil.isEmpty(labMessageEvents)) {
                     return;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/service/MessageSendService.java

@@ -1,50 +0,0 @@
-package com.zd.laboratory.mqtt.service;
-
-/**
- * 消息发送接口
- * @author dgs
- * @time 2019-12-24
- */
-public interface MessageSendService{
-
-    /**
-     * 支付成功mqtt推送
-     * @param orderNo
-     * @param trackX
-     * @param trackY
-     * @return
-     */
-    void SendPaySuccess(String orderNo, Integer trackX, Integer trackY, String macNo, Integer type, Integer number);
-
-    /**
-     * apk发生改变
-     * @return
-     */
-    void ApkVersionChange(String macNo, String url, int versionCode);
-
-    /**
-     * banner改变 1,2,3分别代表广告位的位置
-     */
-    void BannerChange(Integer advicePosition, String macNo);
-
-    /**
-     * 登录
-     * @param token
-     */
-    void login(String token);
-
-    /**
-     * 设备初始化
-     * @param macNo
-     */
-    void init(String macNo);
-
-    /**
-     * 用户扫码通知
-     * @param macNo
-     * @param userId
-     * @param openId
-     * @param type 1代表是补货员2代表不是补货员
-     */
-    void userScanQrcode(String macNo, Long userId, String openId, Integer type);
-}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/service/TerminalRouter.java

@@ -7,7 +7,6 @@ public interface TerminalRouter {
 
     Map<String, TerminalRouter> routerMap = new HashMap<>();
 
-
     void onLine(String codeNum);
 
     void offLine(String codeNum);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/service/impl/MessageSendServiceImpl.java

@@ -1,88 +0,0 @@
-//package com.zd.laboratory.mqtt.service.impl;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.zd.laboratory.mqtt.MqttProducer;
-//import com.zd.laboratory.mqtt.constants.MqttConstants;
-//import com.zd.laboratory.mqtt.service.MessageSendService;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//@Service
-//public class MessageSendServiceImpl implements MessageSendService {
-//
-//    @Autowired
-//    private MqttProducer mqttProducer;
-//
-//    @Override
-//    public void SendPaySuccess(String orderNo,Integer trackX,Integer trackY,String macNo,Integer type,Integer number) {
-//        JSONObject json=new JSONObject();
-//        if(null!=type && type==1){
-//            JSONObject jsonObject=new JSONObject();
-//            jsonObject.put("orderNo",orderNo);
-//            jsonObject.put("number",number);
-//            jsonObject.put("trackX",trackY);
-//            jsonObject.put("trackY",trackX);
-//            json.put("code",1);
-//            json.put("msg","支付成功!");
-//            json.put("data",jsonObject);
-//        }else{
-//            json.put("code",0);
-//            json.put("msg", MqttConstants.MSG);
-//            json.put("data",new JSONObject());
-//        }
-//        mqttProducer.send(MqttConstants.PAY_SUCESS_SEND+macNo,2,json.toJSONString());
-//    }
-//
-//    @Override
-//    //@Async
-//    public void ApkVersionChange(String macNo,String url,int versionCode) {
-//        JSONObject Json=new JSONObject();
-//        Json.put("macno",macNo);
-//        Json.put("url",url);
-//        Json.put("versionCode",versionCode);
-//        mqttProducer.send(MqttConstants.APK_VERSION+macNo,2,Json.toJSONString());
-//    }
-//
-//    @Override
-//    //@Async
-//    public void BannerChange(Integer advicePosition,String macNo) {
-//        JSONObject jsonObject=new JSONObject();
-//        jsonObject.put("position",advicePosition);
-//        mqttProducer.send(MqttConstants.ADVICE_+macNo,2,jsonObject.toJSONString());
-//    }
-//
-//    @Override
-//    public void login(String token) {
-//        JSONObject jsonObject=new JSONObject();
-//        jsonObject.put("token",token);
-//        mqttProducer.send(MqttConstants.LOGIN_SCAN,2,jsonObject.toJSONString());
-//    }
-//
-//    @Override
-//    //@Async
-//    public void init(String macNo) {
-//        JSONObject Json=new JSONObject();
-//        mqttProducer.send(MqttConstants.INIT+macNo,2,Json.toJSONString());
-//    }
-//
-//    @Override
-//    //@Async
-//    public void userScanQrcode(String macNo, Long userId, String openId, Integer type) {
-//        //不是补货员
-//        JSONObject Json=new JSONObject();
-//        if(type==2){
-//            Json.put("code",0);
-//            Json.put("msg","你不是该设备的补货员！");
-//            Json.put("data", new JSONObject());
-//        }else{
-//            JSONObject jsonObject=new JSONObject();
-//            jsonObject.put("macNo",macNo);
-//            jsonObject.put("userId",userId);
-//            jsonObject.put("openId",openId);
-//            Json.put("code",1);
-//            Json.put("msg","登录成功！");
-//            Json.put("data", jsonObject);
-//        }
-//        mqttProducer.send(MqttConstants.LOGIN_SCAN+macNo,2,Json.toJSONString());
-//    }
-//}

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/service/impl/SubMessageSendManager.java

@@ -8,7 +8,6 @@ import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.Assert;
 import com.zd.common.core.utils.SpringUtils;
-import com.zd.laboratory.api.entity.SensorFunctionStatus;
 import com.zd.laboratory.api.vo.SubFunction;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.event.LabMessageEvent;
@@ -24,7 +23,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -96,22 +94,6 @@ public class SubMessageSendManager {
     }
 
     /**
-     * 发送一体机预警测点
-     *
-     * @param id 实验室ID
-     */
-    public void sendWranFunctionToSub(Long id, MessageBody messageBody) {
-
-
-        if (id == null) {
-            return;
-        }
-
-        //仅发送一次
-        commonSend.send(MqttConstants.TOPIC_LAB_BIG_VIEW, messageBody, SendMode.ONCE);
-    }
-
-    /**
      * 发送测点数据 到对应实验室测点数据主题
      *
      * @param subId
@@ -210,15 +192,6 @@ public class SubMessageSendManager {
         if (subFunction == null) {
             return;
         }
-        // 这里是零时处理一下甲烷传感器没有上报describe 数据，这里先用funName代替describe，后期修复好了，在删除这块代码
-//        List<SensorFunctionStatus> functionStatuses = subFunction.getFunctionStatuses();
-//        List<SensorFunctionStatus> newFunctionStatuses = new ArrayList <>();
-//        for(SensorFunctionStatus sensor:functionStatuses){
-//            sensor.setDescribe(sensor.getDescribe());
-//            newFunctionStatuses.add(sensor);
-//        }
-//        subFunction.setFunctionStatuses(newFunctionStatuses);
-        // 到这里结束
         //发送事件
         logger.info("采集器数据接收={}",JSON.toJSONString(subFunction));
         //本来使用mqtt接收，因为mqtt 每个客户端接受到都会处理，