#

tqs

2023-03-27 0b21274e100080f7c240be714f31de0a1a6d626c

#

 src/main/java/com/zy/asrs/controller/ShuttleController.java

@@ -70,9 +70,15 @@
            vo.setBusyStatus(shuttleProtocol.getBusyStatusType().desc); //四向穿梭车状态
            vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//当前任务状态
            vo.setCurrentCode(shuttleProtocol.getCurrentCode());//当前二维码
            vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() + "°");//电池温度
            vo.setBatteryPower(shuttleProtocol.getBatteryPower$() + "%");//电池电量
            vo.setBatteryTemp(shuttleProtocol.getBatteryTemp$() + "°");//电池温度
            if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
                vo.setErrorCode(shuttleProtocol.getErrorCodeType().desc);//错误编号
            }
            vo.setPlcOutputStatusIO(shuttleProtocol.getPlcOutputStatusIO());//Plc输出状态IO
            if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
                vo.setStatusErrorCode(shuttleProtocol.getStatusErrorCode());//错误信息码
            }
            vo.setPlcInputStatus(shuttleProtocol.getPlcInputStatus());//PLC输入状态
            vo.setCurrentOrBeforeCode(shuttleProtocol.getCurrentOrBeforeCode());//当前或者之前读到的二维码值
            vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//读到的二维码X方向偏移量
@@ -80,15 +86,9 @@
            vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//当前的电压值
            vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//当前的模拟量值
            vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//当前的升降伺服速度
            vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//移动速度
            vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//当前的行走伺服速度
            vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad());//当前的升降伺服负载率
            vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad());//当前的行走伺服负载率
            if (!Cools.isEmpty(shuttleProtocol.getErrorCode())) {
                vo.setErrorCode(shuttleProtocol.getErrorCode());//错误编号
            }
            if (!Cools.isEmpty(shuttleProtocol.getStatusErrorCode())) {
                vo.setStatusErrorCode(shuttleProtocol.getStatusErrorCode());//错误信息码
            }
        }
        return R.ok().add(list);
    }
@@ -124,6 +124,10 @@
            if (shuttleProtocol.getProtocolStatusType() != null) {
                vo.setStatus(shuttleProtocol.getProtocolStatusType().desc);//状态
            }
            vo.setCodeOffsetX(shuttleProtocol.getCodeOffsetX());//读到的二维码X方向偏移量
            vo.setCodeOffsetY(shuttleProtocol.getCodeOffsetY());//读到的二维码Y方向偏移量
            vo.setCurrentVoltage(shuttleProtocol.getCurrentVoltage());//当前的电压值
            vo.setCurrentAnalogValue(shuttleProtocol.getCurrentAnalogValue());//当前的模拟量值
            vo.setCurrentMoveServoSpeed(shuttleProtocol.getCurrentMoveServoSpeed());//当前的行走伺服速度
            vo.setCurrentMoveServoLoad(shuttleProtocol.getCurrentMoveServoLoad() + "%");//当前的行走伺服负载率
            vo.setCurrentLiftServoLoad(shuttleProtocol.getCurrentLiftServoLoad() + "%");//当前的升降伺服负载率

 src/main/java/com/zy/asrs/domain/vo/ShuttleMsgTableVo.java

@@ -27,6 +27,26 @@
    private String pakMk = "-";

    /**
     * 读到的二维码X方向偏移量
     */
    private Short codeOffsetX;

    /**
     * 读到的二维码Y方向偏移量
     */
    private Short codeOffsetY;

    /**
     * 当前的电压值
     */
    private Short currentVoltage;

    /**
     * 当前的模拟量值
     */
    private Short currentAnalogValue;

    /**
     * 当前的升降伺服速度
     */
    private Short currentLiftServoSpeed;

 src/main/java/com/zy/asrs/domain/vo/ShuttleStateTableVo.java

@@ -45,7 +45,7 @@
    /**
     * 错误编号
     */
    private Short errorCode;
    private String errorCode;

    /**
     * Plc输出状态IO
@@ -60,7 +60,7 @@
    /**
     * 错误信息码枚举
     */
    private ShuttleErrorCodeType statusErrorCodeType;
    private ShuttleErrorCodeType errorCodeType;

    /**
     * PLC输入状态
@@ -122,19 +122,19 @@
     */
    public String loca = "-";

    public String getStatusErrorCode$() {
        if(this.statusErrorCodeType == null) return null;
        return this.statusErrorCodeType.desc;
    public String getErrorCode$() {
        if(this.errorCodeType == null) return null;
        return this.errorCodeType.desc;
    }

    public void setStatusErrorCode(Short statusErrorCode) {
        this.statusErrorCode = statusErrorCode;
        this.statusErrorCodeType = ShuttleErrorCodeType.get(statusErrorCode.intValue());
        this.errorCodeType = ShuttleErrorCodeType.get(statusErrorCode);
    }

    public void setStatusErrorCode(ShuttleErrorCodeType type) {
        this.statusErrorCode = type.id.shortValue();
        this.statusErrorCodeType = type;
        this.errorCodeType = type;
    }

}