#

Junjie

2025-07-06 0d04bc5d8080b82338302fba0a59fccff2eaedfc

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

@@ -16,6 +16,7 @@
import com.zy.asrs.wcs.core.service.BasLiftService;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.rcs.entity.DeviceDataLog;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
@@ -92,8 +93,13 @@
                //----------读取提升机状态-----------
                //模式
                liftProtocol.setModel(true);

                boolean runningState = data.getInteger("runningState") == 1;
                if (!data.getInteger("completeTaskNo").equals(data.getInteger("taskNo"))) {
                    runningState = true;//工作号不一致，认为处于运行中
                }
                //运行状态
                liftProtocol.setRun(data.getInteger("runningState") == 1);
                liftProtocol.setRun(runningState);
                //就绪状态
                liftProtocol.setReady(data.getInteger("readyState") == 1);
                //有托盘
@@ -483,6 +489,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");
@@ -496,7 +507,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();