#

lty

昨天 276d837c0bb808e6d93ac7c7ba6abe654c75552e

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

@@ -282,80 +282,50 @@
    }


    public String getErrorDev$(){
        if (errorDev.equals("-")){
            boolean back = false;
            String errMsg = "-";
            if (this.isErrOther1()) {
                if (!back){
                    errMsg = "电路保护器断开";
                } else {
                    errMsg = errMsg+"---"+"电路保护器断开";
                }
                back = true;
            }
            if (this.isErrOther2()) {
                if (!back){
                    errMsg = "光电异常";
                } else {
                    errMsg = errMsg+"---"+"光电异常";
                }
                back = true;
            }
            if (this.isErrOther3()) {
                if (!back){
                    errMsg = "运行超时";
                } else {
                    errMsg = errMsg+"---"+"运行超时";
                }
                back = true;
            }
            if (this.isErrOther4()) {
                if (!back){
                    errMsg = "占位超时";
                } else {
                    errMsg = errMsg+"---"+"占位超时";
                }
                back = true;
            }
            if (this.isErrOther5()) {
                if (!back){
                    errMsg = "有任务无货故障";
                } else {
                    errMsg = errMsg+"---"+"有任务无货故障";
                }
                back = true;
            }
            if (this.isErrOther6()) {
                if (!back){
                    errMsg = "变频器故障";
                } else {
                    errMsg = errMsg+"---"+"变频器故障";
                }
                back = true;
            }
            if (this.isErrOther7()) {
                if (!back){
                    errMsg = "接触器故障";
                } else {
                    errMsg = errMsg+"---"+"接触器故障";
                }
                back = true;
            }
            if (this.isErrOther8()) {
                if (!back){
                    errMsg = "顶升电机接触器故障";
                } else {
                    errMsg = errMsg+"---"+"顶升电机接触器故障";
                }
                back = true;
            }
            if (back){
                return errMsg;
            }
        }

        return errorDev;
    public int getErrorDev$(){
        if (errOther1){
            return 1;
        }
        if (errOther2){
            return 2;
        }
        if (errOther3){
            return 3;
        }
        if (errOther4){
            return 4;
        }
        if (errOther5){
            return 5;
        }
        if (errOther6){
            return 6;
        }
        if (errOther7){
            return 7;
        }
        return 0;
    }

    public java.util.List<java.util.Map<String, Object>> getExceptions() {
        java.util.List<java.util.Map<String, Object>> list = new java.util.ArrayList<>();
        if (errOther1) list.add(createException(0, "电路保护器断开"));
        if (errOther2) list.add(createException(1, "光电异常"));
        if (errOther3) list.add(createException(2, "运行超时"));
        if (errOther4) list.add(createException(3, "占位超时"));
        if (errOther5) list.add(createException(4, "有任务无货故障"));
        if (errOther6) list.add(createException(5, "变频器故障"));
        if (errOther7) list.add(createException(6, "接触器故障"));
        if (errOther8) list.add(createException(7, "顶升电机接触器故障"));
        return list;
    }

    private java.util.Map<String, Object> createException(int code, String msg) {
        java.util.Map<String, Object> map = new java.util.HashMap<>();
        map.put("code", code);
        map.put("msg", msg);
        return map;
    }
//    public Integer getNearbySta() {
//        if (getNearbySta == null) return 0;