#

Junjie

2025-07-05 151ba81e92c3c60888cbc04b1a4f3276b8111ac6

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

@@ -6,6 +6,8 @@
import com.core.common.SpringUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.model.DeviceCommandMsgModel;
import com.zy.core.model.DeviceMsgModel;
import com.zy.core.utils.DeviceMsgUtils;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.SlaveType;
@@ -58,7 +60,7 @@
            while (true) {
                try {
                    DeviceMsgUtils deviceMsgUtils = SpringUtils.getBean(DeviceMsgUtils.class);
                    Object deviceCommandMsg = deviceMsgUtils.getDeviceCommandMsg(SlaveType.Shuttle, slave.getId());
                    DeviceCommandMsgModel deviceCommandMsg = deviceMsgUtils.getDeviceCommandMsg(SlaveType.Shuttle, slave.getId());
                    if (deviceCommandMsg == null) {
                        continue;
                    }
@@ -73,15 +75,17 @@
        executeThread.start();
    }

    private void executeCommand(Object deviceCommandMsg) {
    private void executeCommand(DeviceCommandMsgModel deviceCommandMsg) {
        try {
            if (this.socket == null) {
                return;
            }

            Object command = deviceCommandMsg.getCommand();

            // 获取输出流
            OutputStreamWriter writer = new OutputStreamWriter(this.socket.getOutputStream());
            writer.write(JSON.toJSONString(deviceCommandMsg) + "\r\n");
            writer.write(JSON.toJSONString(command) + "\r\n");
            writer.flush();
//            System.out.println("Sent message to server: " + JSON.toJSONString(httpCommand));
        }catch (Exception e) {
@@ -115,7 +119,31 @@
            }

            JSONObject result = JSON.parseObject(sb.toString());//得到响应结果集
            deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, slave.getId(), result);

            String msgType = result.getString("msgType");
            if ("responseMsg".equals(msgType)) {
                JSONObject response = result.getJSONObject("response");
                JSONObject body = response.getJSONObject("body");
                if (body.containsKey("workingMode")) {
                    //read
                    JSONObject data = parseSocketResult(body);

                    DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
                    deviceMsgModel.setDeviceId(slave.getId());
                    deviceMsgModel.setDeviceMsgType("status");
                    deviceMsgModel.setDeviceMsg(data);
                    deviceMsgModel.setDeviceOriginMsg(sb.toString());
                    deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, slave.getId(), deviceMsgModel);
                    return;
                }
            }

            DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
            deviceMsgModel.setDeviceId(slave.getId());
            deviceMsgModel.setDeviceMsgType("command");
            deviceMsgModel.setDeviceMsg(result);
            deviceMsgModel.setDeviceOriginMsg(sb.toString());
            deviceMsgUtils.sendDeviceMsg(SlaveType.Shuttle, slave.getId(), deviceMsgModel);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -144,4 +172,53 @@
    public void close() {

    }

    public JSONObject parseSocketResult(JSONObject data) {
        JSONObject device = new JSONObject();

        //小车设备状态
        device.put("deviceStatus", data.getInteger("free"));
        //小车模式
        device.put("mode", data.getInteger("workingMode"));
        //当前二维码
        device.put("currentCode", data.getString("point"));
        //电池电量
        device.put("batteryPower", data.getString("powerPercent"));
        //电池电压
        device.put("batteryVoltage", data.getInteger("voltage"));
        //故障
        device.put("errorCode", data.getJSONArray("errCode").getString(0));

        //是否顶升
        device.put("hasLift", data.getInteger("liftPosition") == 2 ? true : false);
        //是否有托盘
        device.put("hasPallet", data.getInteger("loadState") == 1 ? true : false);
        //行驶方向
        device.put("runDirection", data.getString("runDir") == null ? "none" : data.getString("runDir"));
        //是否为充电状态
        device.put("hasCharge", data.getInteger("chargState") == 1 ? true : false);
        //运行速度
        device.put("speed", data.getInteger("speed"));

        //*********读取扩展字段**********

        JSONObject extend = new JSONObject();
        device.put("extend", extend);

        //管制状态
        extend.put("suspendState", data.getInteger("suspendState"));
        //最高电芯电压(mV)
        extend.put("maxCellVoltage", data.getInteger("maxCellVoltage"));
        //最低电芯电压(mV)
        extend.put("minCellVoltage", data.getInteger("minCellVoltage"));
        //电池电压
        extend.put("voltage", data.getInteger("voltage"));
        //充放电循环次数
        extend.put("chargeCycleTimes", data.getInteger("chargeCycleTimes"));
        //剩余电量
        extend.put("surplusQuantity", data.getInteger("surplusQuantity"));
        //总电量
        extend.put("countQuantity", data.getInteger("countQuantity"));
        return device;
    }
}