#

lsh

2024-06-21 6c8bbda65905a9dd299062d725682a8bc896cd72

#

 src/main/java/com/zy/core/enums/SteLocaType.java

@@ -3,12 +3,20 @@
public enum SteLocaType {

    NONE(0, "未知"),
    A(1, "A点"),
    B(2, "B点"),
    A_WAITING(3, "A待机点"),
    B_WAITING(4, "B待机点"),
    POINT20(20, "A面平移车"),
    POINT21(21, "硫化罐A端"),
    POINT22(22, "硫化罐B端"),
    POINT23(23, "B面平移车"),
    POINT24(24, "水槽A端"),
    POINT25(25, "水槽B端"),
    POINT26(26, "B端输送线"),
//    A(1, "A点"),
//    B(2, "B点"),
//    A_WAITING(3, "A待机点"),
//    B_WAITING(4, "B待机点"),
    ;


    public Integer id;
    public String desc;
    SteLocaType(Integer id, String desc) {

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

@@ -100,6 +100,20 @@
    public SteLocaType locaType;

    /**
     * 当前位置     1，近点，2远点，3A点，4B点
     */
    public Short locaStart;

    public SteLocaType locaStartType;

    /**
     * 当前位置     1，近点，2远点，3A点，4B点
     */
    public Short locaEnd;

    public SteLocaType locaEndType;

    /**
     * 近点距离
     */
    public Double closer;
@@ -226,6 +240,26 @@
        this.loca = SteLocaType.get(type).id.shortValue();
    }

    public void setLocaStart(Short locaStart){
        this.locaStart = locaStart;
        this.locaStartType = SteLocaType.get(locaStart);
    }

    public void setLocaStart(SteLocaType type){
        this.locaStartType = type;
        this.locaStart = SteLocaType.get(type).id.shortValue();
    }

    public void setLocaEnd(Short locaEnd){
        this.locaEnd = locaEnd;
        this.locaEndType = SteLocaType.get(locaEnd);
    }

    public void setLocaEnd(SteLocaType type){
        this.locaEndType = type;
        this.locaEnd = SteLocaType.get(type).id.shortValue();
    }

    public void setHisTaskStatus(Short hisTaskStatus){
        this.hisTaskStatus = hisTaskStatus;
        this.hisTaskStatusType = SteHisTaskStatusType.get(hisTaskStatus);

 src/main/java/com/zy/core/thread/SteThread.java

@@ -143,44 +143,23 @@
                steProtocol.setRow(siemensS7Net.getByteTransform().TransInt16(result.Content, 14));
                steProtocol.setBay(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));
                steProtocol.setLev(siemensS7Net.getByteTransform().TransInt16(result.Content, 18));

//                steProtocol.setReady(siemensS7Net.getByteTransform().TransInt16(result.Content, 20));
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, 20, 1);
                steProtocol.setReady(status[0]?(short)1:(short)0);
                steProtocol.setLoca(siemensS7Net.getByteTransform().TransInt16(result.Content, 20));
                steProtocol.setLocaStart(siemensS7Net.getByteTransform().TransInt16(result.Content, 22));
                steProtocol.setLocaEnd(siemensS7Net.getByteTransform().TransInt16(result.Content, 24));
                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, 26, 1);
//                steProtocol.setReady(status[0]?(short)1:(short)0);
//                steProtocol.setReady(status[1]?(short)1:(short)0);
//                steProtocol.setReady(status[2]?(short)1:(short)0);
//                steProtocol.setLoad(status[3]?(short)1:(short)0);
//                steProtocol.setReady(status[4]?(short)1:(short)0);
                steProtocol.setChargeStatus(status[5]?(short)1:(short)0);
                steProtocol.setTrack(status[6]?(short)1:(short)0);
                steProtocol.setReady(status[3]?(short)1:(short)0);
//                steProtocol.setReady(status[3]?(short)1:(short)0);
//                steProtocol.setTrack(status[6]?(short)1:(short)0);

                SteLocaType locaType = SteLocaType.NONE;
                boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, 21, 1);
                if (steProtocol.getRow().intValue() >= 6) {
                    if (status[7]){//A点
                        locaType = SteLocaType.A;
                    }
                    if (status2[1]){//A待机点
                        if (locaType.equals(SteLocaType.NONE)) {
                            locaType = SteLocaType.A_WAITING;
                        }
                    }
                }else {
                    if (status2[0]){//B点
                        if (locaType.equals(SteLocaType.NONE)) {
                            locaType = SteLocaType.B;
                        }
                    }
                    if (status2[2]){//B待机点
                        if (locaType.equals(SteLocaType.NONE)) {
                            locaType = SteLocaType.B_WAITING;
                        }
                    }
                }
                boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, 27, 1);

                steProtocol.setLoca(locaType.id.shortValue());
                steProtocol.setReady(status2[3]?(short)1:(short)0);
                steProtocol.setLoad(status2[4]?(short)1:(short)0);
                steProtocol.setChargeStatus(status[0]?(short)1:(short)0);
                steProtocol.setTrack(status[1]?(short)1:(short)0);

//                steProtocol.setLoad(status2[6]?(short)1:(short)0);
                steProtocol.setLoad(status2[7]?(short)1:(short)0);

                OutputQueue.STE.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功",DateUtils.convert(new Date()), slave.getId()));