Junjie
2024-09-12 c461b8c84187de2ce795d5ccfdb535bb4e835c1b
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -117,6 +117,11 @@
                if (deviceStatus == 255) {
                    //离线
                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
                }else if (deviceStatus == 3) {
                    //就绪状态且离线
                    if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
                        shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
                    }
                }
                if(deviceStatus != 4 || deviceStatus != 6 || deviceStatus != 7 || deviceStatus != 8 || deviceStatus != 255 || deviceStatus != -1) {
@@ -127,7 +132,7 @@
                //当前二维码
                shuttleProtocol.setCurrentCode(data.getString("groundCode") == null ? "0" : data.getString("groundCode"));
                //电池电量
                shuttleProtocol.setBatteryPower(data.getString("battery") == null ? "0%" : data.getString("battery"));
                shuttleProtocol.setBatteryPower(data.getString("battery") == null ? "0" : data.getString("battery"));
                //故障
                shuttleProtocol.setErrorCode(deviceStatus == 6 ? "1" : "0");
@@ -781,6 +786,11 @@
    //请求登录
    private String requestLoginToken() {
        try {
            Object redisToken = redisUtil.get(DeviceRedisConstant.RDS_LOGIN_TOKEN);
            if(redisToken != null) {
                return redisToken.toString();
            }
            HashMap<String, Object> param = new HashMap<>();
            param.put("username", "admin");
            param.put("password", "admin123");
@@ -794,7 +804,9 @@
            JSONObject jsonObject = JSON.parseObject(response);
            Integer code = jsonObject.getInteger("code");
            if (code.equals(200)) {
                return jsonObject.getString("token");
                String token = jsonObject.getString("token");
                redisUtil.set(DeviceRedisConstant.RDS_LOGIN_TOKEN, token, 60 * 15);
                return token;
            }
        } catch (Exception e) {
            e.printStackTrace();