#

Junjie

4 天以前 456273f11d75782e676d43763f0f0601ea5c37f8

 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java

@@ -22,10 +22,12 @@
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.Utils.DeviceMsgUtils;
import com.zy.core.action.ShuttleAction;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.*;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.DeviceMsgModel;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.command.NyShuttleHttpCommand;
import com.zy.core.model.command.ShuttleCommand;
@@ -38,11 +40,7 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.Socket;
import java.text.MessageFormat;
import java.util.*;

@@ -53,7 +51,6 @@
    private ShuttleSlave slave;
    private RedisUtil redisUtil;
    private ShuttleProtocol shuttleProtocol;
    private Socket socket;

    private static final boolean DEBUG = false;//调试模式

@@ -71,27 +68,15 @@
    @Override
    public void run() {
        News.info("{}号四向车线程启动", slave.getId());
        this.connect();

        //监听消息并存储
        Thread innerThread = new Thread(() -> {
            while (true) {
                try {
                    listenSocketMessage();
                    listenInit();//监听初始化事件
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        });
        innerThread.start();

        //设备读取
        Thread readThread = new Thread(() -> {
            while (true) {
                try {
                    listenMessageFromRedis();
                    listenInit();//监听初始化事件
                    read();
                    Thread.sleep(50);
                    Thread.sleep(100);
                } catch (Exception e) {
                    log.error("ShuttleThread Fail", e);
                }
@@ -174,27 +159,17 @@
        }
    }

    private void listenSocketMessage() {
    private void listenMessageFromRedis() {
        try {
            if (this.socket == null) {
            DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
            if (deviceMsgUtils == null) {
                return;
            }

            // 获取输入流
            BufferedReader reader = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
            // 读取服务器的响应
            StringBuffer sb = new StringBuffer();
            char[] chars = new char[2048];//缓冲区
            while (true) {
                reader.read(chars);
                String trim = new String(chars);
                sb.append(trim);
                if (trim.lastIndexOf("\r\n") != -1) {
                    break;
                }
            DeviceMsgModel deviceMsg = deviceMsgUtils.getDeviceMsg(SlaveType.Shuttle, slave.getId());
            if(deviceMsg == null){
                return;
            }

            JSONObject result = JSON.parseObject(sb.toString());//得到响应结果集
            JSONObject result = JSON.parseObject(deviceMsg.getDeviceMsg().toString());//得到响应结果集

            String msgType = result.getString("msgType");
            if ("responseMsg".equals(msgType)) {
@@ -265,10 +240,6 @@

    private void read() {
        try {
            if (this.socket == null || this.socket.isClosed()) {
                //链接断开重新链接
                this.connect();
            }
            readStatus();
        } catch (Exception e) {
            e.printStackTrace();
@@ -288,8 +259,13 @@
            }

            //----------读取四向穿梭车状态-----------
            DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
            NyShuttleHttpCommand readStatusCommand = getReadStatusCommand(slave.getId());
            requestCommandAsync(readStatusCommand);//请求状态
            //指令超过五条，不再下发任务状态请求
            TreeSet<String> deviceCommandMsgListKey = deviceMsgUtils.getDeviceCommandMsgListKey(SlaveType.Shuttle, slave.getId());
            if (deviceCommandMsgListKey.size() < 5) {
                requestCommand(readStatusCommand);//请求状态
            }

            if (this.socketReadResults.isEmpty()) {
                if (System.currentTimeMillis() - shuttleProtocol.getLastOnlineTime() > 1000 * 60) {
@@ -377,14 +353,6 @@
        } catch (Exception e) {
            e.printStackTrace();
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            try {
                this.socket.close();
                this.socket = null;
                Thread.sleep(1000);
                this.connect();
            } catch (IOException | InterruptedException exception) {
                e.printStackTrace();
            }
        }
    }

@@ -721,6 +689,19 @@
            }
        }

        //***************判断是否满充校准***************
        Config shuttleMaxPowerVerifyConfig = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "shuttleMaxPowerVerify")
                .eq("status", 1));
        if (shuttleMaxPowerVerifyConfig != null) {
            if (shuttleMaxPowerVerifyConfig.getValue().equals("true")) {
                if (this.shuttleProtocol.getBatteryVoltage() < 5630) {
                    return false;//电压不够继续充电
                }
            }
        }
        //***************判断是否满充校准***************

        if (this.shuttleProtocol.getHasCharge() == null) {
            return false;
        }
@@ -1053,17 +1034,6 @@

    @Override
    public boolean connect() {
        try {
            Socket socket = new Socket(slave.getIp(), slave.getPort());
            socket.setSoTimeout(10000);
            socket.setKeepAlive(true);
            this.socket = socket;
            log.info(MessageFormat.format("【{0}】四向穿梭车Socket链接成功 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
        } catch (IOException e) {
            OutputQueue.SHUTTLE.offer(MessageFormat.format("【{0}】四向穿梭车Socket链接失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            return false;
        }

        return true;
    }

@@ -1119,7 +1089,8 @@
    //发出请求
    private JSONObject requestCommand(NyShuttleHttpCommand httpCommand) throws IOException {
        try {
            if (this.socket == null) {
            DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
            if (deviceMsgUtils == null) {
                return null;
            }

@@ -1127,11 +1098,7 @@
            JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
            data.remove("nodes");

            // 获取输出流
            OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
            writer.write(JSON.toJSONString(data) + "\r\n");
            writer.flush();
//            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
            String key = deviceMsgUtils.sendDeviceCommand(SlaveType.Shuttle, slave.getId(), data);

            String requestType = null;
            String taskId = null;
@@ -1144,9 +1111,9 @@
            }

            // 获取服务器响应
            // 尝试10次
            // 尝试30次
            JSONObject result = null;
            for (int i = 0; i < 10; i++) {
            for (int i = 0; i < 30; i++) {
                result = getRequestBody(requestType, taskId);
                if (result == null) {
                    try {
@@ -1163,26 +1130,6 @@
            e.printStackTrace();
        }
        return null;
    }

    private void requestCommandAsync(NyShuttleHttpCommand httpCommand) throws IOException {
        if (this.socket == null) {
            return;
        }

       try {
           //压缩数据包
           JSONObject data = JSON.parseObject(JSON.toJSONString(httpCommand));
           data.remove("nodes");

           // 获取输出流
           OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
           writer.write(JSON.toJSONString(data) + "\r\n");
           writer.flush();
//            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
       }catch (Exception e) {
           e.printStackTrace();
       }
    }

    private JSONObject filterBodyData(JSONObject data) {