#

Junjie

2024-03-25 4ca5d03d8d95c78e29eaeba01a5dc4eae019bad3

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/constant/DeviceRedisConstant.java

New file
@@ -0,0 +1,18 @@
package com.zy.asrs.wcs.rcs.constant;

/**
 * Created by vincent on 2023/11/6
 */
public class DeviceRedisConstant {

    public static final String SHUTTLE_FLAG = "shuttle_no_";

    public static final String SHUTTLE_WORK_FLAG = "shuttle_wrk_no_";

    public static final String LIFT_FLAG = "lift_no_";

    public static final String LIFT_WORK_FLAG = "lift_wrk_no_";

    public static final String MAP = "realtimeBasMap_";

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/protocol/ShuttleProtocol.java

@@ -1,7 +1,10 @@
package com.zy.asrs.wcs.rcs.model.protocol;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wcs.core.utils.RedisUtil;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleDeviceStatusType;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
import com.zy.asrs.wcs.rcs.entity.Device;
@@ -26,7 +29,7 @@
    /**
     * 任务号
     */
    private String taskNo;
    private Integer taskNo;

    /**
     * 当前小车状态（内部自我维护）
@@ -211,4 +214,15 @@
        return false;//默认不空闲
    }

    public Integer getTaskNo() {
        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
        if (null != redisUtil) {
            Object o = redisUtil.get(DeviceRedisConstant.SHUTTLE_FLAG + this.taskNo);
            if (!Cools.isEmpty(o)) {
                this.taskNo = Integer.parseInt(String.valueOf(o));
            }
        }
        return this.taskNo == null ? 0 : this.taskNo;
    }

}

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

@@ -85,15 +85,15 @@
                //小车忙状态位
                shuttleProtocol.setDeviceStatus(data.getInteger("deviceStatus"));
                //当前二维码
                shuttleProtocol.setCurrentCode(data.getString("deviceLocation"));
                shuttleProtocol.setCurrentCode(data.getString("deviceLocation") == null ? "0" : data.getString("deviceLocation"));
                //电池电量
                shuttleProtocol.setBatteryPower(data.getString("battery"));
                shuttleProtocol.setBatteryPower(data.getString("battery") == null ? "0%" : data.getString("battery"));


                //是否顶升
                shuttleProtocol.setHasLift(data.getInteger("palletStatus") == 1 ? true : false);
                //行驶方向
                shuttleProtocol.setRunDirection(data.getString("direction"));
                shuttleProtocol.setRunDirection(data.getString("direction") == null ? "none" : data.getString("direction"));

                ///读取四向穿梭车状态-end