#

Junjie

2024-09-21 e1b28ee09836787555448083bf9a6b59477ad330

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java

@@ -646,6 +646,10 @@
            case SHUTTLE_MOVE_DOWN_PALLET://穿梭车移动并托盘下降
            case SHUTTLE_MOVE_FROM_LIFT://出提升机
            case SHUTTLE_MOVE_TO_LIFT://进提升机
            case SHUTTLE_PALLET_LIFT://托盘顶升
            case SHUTTLE_PALLET_DOWN://托盘下降
            case SHUTTLE_CHARGE_ON://充电开
            case SHUTTLE_CHARGE_OFF://充电关
                return deviceTaskNo;
            default:
                return taskNo;
@@ -786,6 +790,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");
@@ -799,7 +808,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();