1

zhang

昨天 16d8d76552c4e42a2322984b6c62363926003f98

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java

@@ -3,9 +3,9 @@
import HslCommunication.Core.Types.OperateResultExOne;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.constant.DeviceField;
import com.zy.acs.conveyor.core.constant.PlcAlarmDefinition;
import com.zy.acs.conveyor.core.constant.StationStatusField;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.*;
import com.zy.acs.conveyor.core.model.SafeSignal;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.properties.DevpSlave;
import com.zy.acs.conveyor.core.service.DevpS7Service;
@@ -36,6 +36,9 @@
    private SiemensS7Net siemensS7Net;

    private Map<Integer, StaProtocol> station;

    private final RedisSupport redis = RedisSupport.defaultRedisSupport;


    private static final int WRITE_RETRY_MAX = 5;

@@ -125,6 +128,10 @@
        // 读取PLC故障
        readPlcAlarms(staNos, staNoSize);

        // 读取安全交互信号
        readSaleSingle(slave.getPutSta(), slave.getTakeSta());


        // 定期更新数据库（降低频率）
        updateDatabaseIfNeeded();
    }
@@ -138,9 +145,13 @@
        staProtocol.setStaNo((int) siemensS7Net.getByteTransform().TransInt16(
                content, offset + StationStatusField.FINAL_TARGET.getOffset()));

        boolean[] status = siemensS7Net.getByteTransform().TransBool(
        boolean[] status0 = siemensS7Net.getByteTransform().TransBool(
                content, offset + StationStatusField.STATUS_WORD.getOffset(),
                StationStatusField.STATUS_WORD.getByteLength());

        boolean[] status = siemensS7Net.getByteTransform().TransBool(
                content, offset + StationStatusField.STATUS_WORD.getOffset(),
                1);

        staProtocol.setAutoing(status[0]);
        staProtocol.setLoading(status[1]);
@@ -150,8 +161,19 @@
        staProtocol.setFullPlt(status[5]);
        staProtocol.setHigh(status[6]);
        staProtocol.setLow(status[7]);
        boolean[] status2 = siemensS7Net.getByteTransform().TransBool(
                content, offset + StationStatusField.STATUS_WORD.getOffset() + 1,
                1);
        staProtocol.setMid(status2[0]);
        staProtocol.setStartup(status2[1]);
        staProtocol.setSegApply(status2[2]);
        staProtocol.setApplyErr(status2[3]);


        for (int i = 0; i < 8; i++){
            if (status0[i+8]==status2[i]){
                log.info("状态码不一致 [id:{}] [i:{}] [status0:{}] [status2:{}]", slave.getId(), i, status0[i], status2[i]);
            }
        }
    }

    /**
@@ -313,6 +335,64 @@
    }

    /**
     * 读取安全交互信号
     */
    private void readSaleSingle(List<DevpSlave.Sta> putSta, List<DevpSlave.Sta> takeSta) {
        int staNoSize = putSta.size();
        OperateResultExOne<byte[]> result = siemensS7Net.Read(
                SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.buildAddress(),
                (short) (staNoSize * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength()));


        if (!result.IsSuccess) {
            log.warn("读取PLC安全交互信息异常 [id:{}]", slave.getId());
            return;
        }

        byte[] content = result.Content;
        for (int i = 0; i < staNoSize; i++) {
            Integer put = putSta.get(i).getStaNo();
            Integer take = takeSta.get(i).getStaNo();
            StaProtocol staProtocolPut = station.get(put);
            StaProtocol staProtocolTake = station.get(take);
            if (staProtocolPut == null || staProtocolTake == null) {
                log.warn("站点不存在 [id:{}] [staNo:{},{}]", slave.getId(), put, take);
                continue;
            }

            boolean[] status = siemensS7Net.getByteTransform().TransBool(
                    content, i * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength(), 1);

            boolean[] status2 = siemensS7Net.getByteTransform().TransBool(
                    content, i * SafeSignalField.SAFE_SIGNAL_FROM_CONVEYOR.getByteLength() + 2, 1);

            staProtocolPut.setHeartbeat(status[0]);
            staProtocolPut.setAllowTake(status[1]);
            staProtocolPut.setAllowPut(status[2]);
            staProtocolPut.setInComplete(status[3]);
            staProtocolPut.setOutComplete(status[4]);

            staProtocolTake.setHeartbeat(status2[0]);
            staProtocolTake.setAllowTake(status2[1]);
            staProtocolTake.setAllowPut(status2[2]);
            staProtocolTake.setInComplete(status2[3]);
            staProtocolTake.setOutComplete(status2[4]);
            //
            if (status[3]) {
                staProtocolPut.setSafeSignal( new SafeSignal(i, (short) 0, true));
                redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG,staProtocolPut);
                News.info("安全交互信号复位 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
            }
            if (status2[4]) {
                staProtocolTake.setSafeSignal(new SafeSignal(i, (short) 0, false));
                redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolTake);
                News.info("安全交互信号复位 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
            }

        }
    }

    /**
     * 按需更新数据库（降低更新频率）
     */
    private void updateDatabaseIfNeeded() {