bugxiugai

Administrator

1 天以前 c1376645c9ea45db0bd0f90ac693b22ab6ecad05

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

@@ -197,6 +197,7 @@
        }
    }


    @Override
    public boolean connect() {
        boolean result = false;
@@ -318,7 +319,7 @@
                    if (staProtocol != null) {
                        while (iterator.hasNext()) {
                            String next = iterator.next();
                            if (next.length() < 7 || next.length() > 10) {
                            if (next.length() < 7 || next.length() > 10 || !next.matches("[0-9]*")) {
                                iterator.remove();
                            }
                        }
@@ -414,11 +415,11 @@
            }

            // 读正面故障反馈
            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0", (short) (16 * 4));
            OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2340.0", (short) (16 * 2));
            if (resultErr.IsSuccess) {
                for (int i = 0; i < 16; i++) {
                    Integer siteId = staNos.get(i); // 站点编号
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4, 1);
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 2, 2);
                    StaProtocol staProtocol = station.get(siteId);
                    staProtocol.setBreakerErr(status[0]);
                    staProtocol.setInfraredErr(status[1]);
@@ -428,16 +429,20 @@
                    staProtocol.setInverterErr(status[5]);
                    staProtocol.setContactErr(status[6]);
                    staProtocol.setUpcontactErr(status[7]);

                    staProtocol.setPushTheEnvelopeErr(status[8]);
                    staProtocol.setRaiseTheLowerLimitErr(status[9]);
                    staProtocol.setLeftProtectionTriggersErr(status[10]);
                    staProtocol.setRightProtectionTriggersErr(status[11]);
                    staProtocol.setGratingBlockingErr(status[12]);
                }
            }

            // 读侧面故障反馈
            OperateResultExOne<byte[]> resultErrCM = siemensS7Net.Read("DB101.2540.0", (short) (12 * 4));
            OperateResultExOne<byte[]> resultErrCM = siemensS7Net.Read("DB101.2540.0", (short) (12 * 2));
            if (resultErrCM.IsSuccess) {
                for (int i = 16; i < staNoSize; i++) {
                    Integer siteId = staNos.get(i); // 站点编号
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErrCM.Content, (i - 16) * 4, 1);
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErrCM.Content, (i - 16) * 2, 1);
                    StaProtocol staProtocol = station.get(siteId);
                    staProtocol.setBreakerErr(status[0]);
                    staProtocol.setInfraredErr(status[1]);
@@ -777,19 +782,19 @@

        if (slave.getId() == 1 && this.ioModeOf2F1 != null) {
            if (!siemensS7Net.Write("DB105.10", this.ioModeOf2F1.id).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F2入出库模式失败。输送线plc编号={1}", slave.getId()));
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F1入出库模式失败。输送线plc编号={1}", slave.getId()));
                log.error("写入输送线2F1入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }
        if (slave.getId() == 1 && this.ioModeOf2F2 != null) {
            if (!siemensS7Net.Write("DB105.12", this.ioModeOf2F2.id).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F1入出库模式失败。输送线plc编号={1}", slave.getId()));
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F2入出库模式失败。输送线plc编号={1}", slave.getId()));
                log.error("写入输送线2F2入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }
        if (slave.getId() == 1 && this.ioModeOf2F3 != null) {
            if (!siemensS7Net.Write("DB105.14", this.ioModeOf2F3.id).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F2入出库模式失败。输送线plc编号={1}", slave.getId()));
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F3入出库模式失败。输送线plc编号={1}", slave.getId()));
                log.error("写入输送线2F3入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }