#显示器更新

Junjie

2024-02-23 3b64c807f60e5d6b71deca3f79c9be4be19abfaa

 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java

@@ -244,6 +244,16 @@
     */
    private Integer yCurrent = 0;

    /**
     * 指令下发时间
     */
    private Long sendTime = 0L;

    /**
     * 日志采集时间
     */
    private Long deviceDataLog = System.currentTimeMillis();

    //总里程数
    @Data
    public static class StatusSumClass {
@@ -484,21 +494,22 @@
                && this.taskNo == 0
                && this.protocolStatus == ShuttleProtocolStatusType.IDLE.id
                ;
        if (!res) {
            return res;
        } else {
            // 电量
            try {
                Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
                if (chargeLine == null) {
                    return false;
                }
                return this.getPowerPercent() >= chargeLine;
            } catch (Exception e) {
                News.error("fail", e);
                return false;
            }
        }
        return res;
//        if (!res) {
//            return res;
//        } else {
//            // 电量
//            try {
//                Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
//                if (chargeLine == null) {
//                    return false;
//                }
//                return this.getPowerPercent() >= chargeLine;
//            } catch (Exception e) {
//                News.error("fail", e);
//                return false;
//            }
//        }
    }

    // 是否处于空闲待命状态，传入的taskNo和当前taskNo相同时允许放行
@@ -509,18 +520,19 @@
                && (this.taskNo == 0 || this.taskNo == taskNo)
                && this.protocolStatus.intValue() == ShuttleProtocolStatusType.IDLE.id
                ;
        if (!res) {
            return res;
        } else {
            // 电量
            try {
                Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
                return this.getPowerPercent() > chargeLine;
            } catch (Exception e) {
                News.error("fail", e);
                return false;
            }
        }
        return res;
//        if (!res) {
//            return res;
//        } else {
//            // 电量
//            try {
//                Integer chargeLine = SpringUtils.getBean(BasShuttleService.class).selectById(this.shuttleNo).getChargeLine();
//                return this.getPowerPercent() > chargeLine;
//            } catch (Exception e) {
//                News.error("fail", e);
//                return false;
//            }
//        }
    }

    // 是否处于空闲待命状态
@@ -582,4 +594,10 @@
            }
        }
    }

    public void setShuttleNo(Short shuttleNo) {
        if (shuttleNo != 0) {
            this.shuttleNo = shuttleNo;
        }
    }
}