map_1.json

Junjie

2023-07-04 6b9fbba050fcbc7e9478bbd0a008a3b7f08d7a1d

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

@@ -246,6 +246,29 @@
    }

    // 是否处于空闲待命状态
    public Boolean isIdle(Short taskNo) {
        if(this.taskNo == null
                || this.liftLock == null
                || this.ready == null
                || this.running == null
                || this.mode == null
                || this.pakMk == null
        ){
            return false;
        }

        boolean res = (this.taskNo == 0 || this.taskNo.intValue() == taskNo.intValue())
                && !this.liftLock
//                && this.ready
                && !this.running
                && this.mode
                && this.pakMk.equals(true)
                && !this.securityMk
                ;
        return res;
    }

    // 是否处于空闲待命状态
    public Boolean isIdle() {
        if(this.taskNo == null
                || this.liftLock == null
@@ -268,8 +291,30 @@
        return res;
    }

    // 是否处于空闲待命状态，不判断任务号
    public Boolean isIdleNoTask() {
        if(this.taskNo == null
                || this.liftLock == null
                || this.ready == null
                || this.running == null
                || this.mode == null
                || this.pakMk == null
        ){
            return false;
        }

        boolean res = !this.liftLock
//                && this.ready
                && !this.running
                && this.mode
                && this.pakMk
                && !this.securityMk
                ;
        return res;
    }

    public void setPositionArrivalFeedback(Short position) {
        Short lev = 1;
        Short lev = null;
        switch (position) {
            case 1:
                lev = 1;