From 9c3da520c38c813d6b615adb5b49e7519c994f6b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 13 六月 2025 12:53:45 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  809 +--------------------------------------------------------
 1 files changed, 23 insertions(+), 786 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9e5dc64..9139aaa 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -1,38 +1,14 @@
 package com.zy.core.thread;
 
-import HslCommunication.Core.Types.OperateResult;
-import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
 import HslCommunication.Profinet.Siemens.SiemensS7Net;
-import com.alibaba.fastjson.JSON;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.CommandInfoLog;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.service.*;
 import com.zy.core.DevpThread;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.OutputQueue;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CommandStatusType;
 import com.zy.core.enums.IoModeType;
-import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.protocol.Cycle;
 import com.zy.core.model.protocol.StaProtocol;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
-import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -48,72 +24,9 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
-        add(1001);
-        add(1002);
-        add(1003);
-        add(1004);
-        add(1005);
-        add(1006);
-        add(1007);
-        add(1008);
-        add(1009);
-        add(1010);
-        add(1011);
-        add(1012);
-        add(1013);
-        add(1014);
-        add(1015);
-        add(1016);
-        add(1017);
-        add(1018);
-        add(1019);
-        add(1020);
 
-
-    }};
-    public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
-        add(2001);
-        add(2002);
-        add(2003);
-        add(2004);
-        add(2005);
-        add(2006);
-        add(2007);
-        add(2008);
-        add(2009);
-        add(2010);
-        add(2011);
-        add(2012);
-        add(2013);
-        add(2014);
-        add(2015);
-        add(2016);
-        add(2017);
-        add(2018);
-        add(2019);
-
-    }};
-    public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
-        add(1051);
-        add(1052);
-        add(1053);
-        add(1054);
-        add(1055);
-        add(1056);
-        add(1057);
-        add(1058);
-    }};
-    public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
-        add(2051);
-        add(2052);
-        add(2053);
-        add(2054);
-        add(2055);
-        add(2056);
-        add(2057);
-        add(2058);
-
+    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+        add(100);
     }};
 
     /**
@@ -129,732 +42,56 @@
      * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
      * 4.鍑哄簱妯″紡
      */
-    public IoModeType ioModeOf2F = IoModeType.NONE;
-
-    //    public IoModeType ioMode = IoModeType.NONE;
-    private ArrayList<Integer> getStaNo() {
-        switch (slave.getId()) {
-            case 1:
-                return staNos1;
-            case 2:
-                return staNos2;
-            case 3:
-                return staNos3;
-            case 4:
-                return staNos4;
-            default:
-                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
-        }
-    }
+    public IoModeType ioModeOf1F = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
     }
 
-    @Override
-    @SuppressWarnings("InfiniteLoopStatement")
-    public void run() {
-        connect();
-        while (true) {
-            try {
-                int step = 1;
-                Task task = MessageQueue.poll(SlaveType.Devp, slave.getId());
-                if (task != null) {
-                    step = task.getStep();
-                }
-                switch (step) {
-                    // 璇绘暟鎹�
-                    case 1:
-                        read();
-                        break;
-                    // 鍐欐暟鎹� ID+鐩爣绔�
-                    case 2:
-                        write((StaProtocol) task.getData());
-                        read();
-                        break;
-                    // 鍐欐暟鎹� ID+鐩爣绔�
-                    case 4:
-                        writeCycle((StaProtocol) task.getData());
-                        read();
-                        break;
-                   /* case 3:
-                        write2((StaProtocol)task.getData());
-                        read();
-                        break;*/
-                    default:
-                        break;
-                }
-                // 蹇冭烦
-//                heartbeat();
-                Thread.sleep(400);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
 
-        }
-    }
-
-    /**
-     * 鍒濆鍖栫珯鐐圭姸鎬�
-     */
-    private void initSite() {
-        ArrayList<Integer> staNos = getStaNo();
+    public void setData(Integer siteId, boolean loading, boolean inEnable, boolean outEnable) {
         // 绔欑偣缂栧彿
-        for (Integer siteId : staNos) {
-            StaProtocol staProtocol = station.get(siteId);
-            if (null == staProtocol) {
-                staProtocol = new StaProtocol();
-                staProtocol.setSiteId(siteId);
-                station.put(siteId, staProtocol);
-            }
-            staProtocol.setWorkNo((short) 0);    // ID
-            staProtocol.setAutoing(false);      // 鑷姩
-            staProtocol.setLoading(false);      // 鏈夌墿
-            staProtocol.setInEnable(false);     // 鍙叆
-            staProtocol.setOutEnable(false);    // 鍙嚭
-            staProtocol.setEmptyMk(false);      // 绌烘澘淇″彿
-            staProtocol.setStaNo((short) 0);     // 鐩爣绔�
-
-            if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-                staProtocol.setPakMk(true);
-            }
-        }
-    }
-
-    @Override
-    public boolean connect() {
-        boolean result = false;
-        siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, slave.getIp());
-        siemensS7Net.setRack(slave.getRack().byteValue());
-        siemensS7Net.setSlot(slave.getSlot().byteValue());
-        OperateResult connect = siemensS7Net.ConnectServer();
-        if (connect.IsSuccess) {
-            result = true;
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-            log.info("杈撻�佺嚎plc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-        } else {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}]  [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-            log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-//            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-//            deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
-            initSite();
-        }
-        siemensS7Net.ConnectClose();
-        return result;
-    }
-
-    /**
-     * 璇诲彇鐘舵�� ====> 鏁村潡plc
-     */
-    private void read() throws InterruptedException {
-//        // 鏇存柊鍏ュ嚭搴撴ā寮�
-//        updateIoMode();
-        ArrayList<Integer> staNos = getStaNo();
-        int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 8));
-        if (result.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+        for (Integer sta : staNos) {
+            if (sta.equals(siteId)) {
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
                     staProtocol = new StaProtocol();
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8));     // 宸ヤ綔鍙�
-
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4));   // 鐩爣绔�
-
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
-                staProtocol.setAutoing(status[0]);  // 鑷姩
-                staProtocol.setLoading(status[1]);  // 鏈夌墿
-                staProtocol.setInEnable(status[2]); // 鍙叆
-                staProtocol.setOutEnable(status[3]);// 鍙嚭
-                staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
-                staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-                staProtocol.setLow(status[7]);      // 浣庡簱浣�
-
+                staProtocol.setWorkNo((short) 0);    // ID
+                staProtocol.setAutoing(true);      // 鑷姩
+                staProtocol.setLoading(loading);      // 鏈夌墿
+                staProtocol.setInEnable(inEnable);     // 鍙叆
+                staProtocol.setOutEnable(outEnable);    // 鍙嚭
+                staProtocol.setEmptyMk(false);      // 绌烘澘淇″彿
+                staProtocol.setStaNo((short) 0);     // 鐩爣绔�
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
                 }
             }
         }
-
-        //鏉$爜
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0", (short) 8);
-        if (result2.IsSuccess) {
-            for (int i = 0; i < 1; i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId());
-                if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                    barcodeThread.setBarcode(barcode);
-                }
-            }
-        }
-
-        //澶栧舰妫�娴�
-        OperateResultExOne<byte[]> resultErr1 = siemensS7Net.Read("DB101.802.0", (short) (barcodeSize * 1));
-        if (resultErr1.IsSuccess) {
-            int sta = 0;
-            switch (slave.getId()) {
-                case 1:
-                    sta = 1014;
-                    break;
-                case 2:
-                    sta = 2007;
-                    break;
-                case 3:
-                    sta = 1052;
-                    break;
-                case 4:
-                    sta = 2056;
-                    break;
-            }
-            StaProtocol staProtocol1 = station.get(sta);
-            boolean[] status1 = siemensS7Net.getByteTransform().TransBool(resultErr1.Content, 0, 1);
-            staProtocol1.setFrontErr(status1[0]);
-            staProtocol1.setBackErr(status1[1]);
-            staProtocol1.setHighErr(status1[2]);
-            staProtocol1.setLeftErr(status1[3]);
-            staProtocol1.setRightErr(status1[4]);
-            staProtocol1.setWeightErr(status1[5]);
-            staProtocol1.setBarcodeErr(status1[6]);
-        }
-
-
-//        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.922.0", (short) (staNoSize * 4));
-//        if (resultErr.IsSuccess) {
-//            for (int i = 0; i < staNoSize; i++) {
-//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-//                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4, 1);
-//                StaProtocol staProtocol = station.get(siteId);
-//                staProtocol.setBreakerErr(status[0]);
-//                staProtocol.setInfraredErr(status[1]);
-//                staProtocol.setOutTimeErr(status[2]);
-//                staProtocol.setSeizeSeatErr(status[3]);
-//                staProtocol.setWrkYgoodsN(status[4]);
-//                staProtocol.setInverterErr(status[5]);
-//                staProtocol.setContactErr(status[6]);
-//                staProtocol.setUpcontactErr(status[7]);
-//
-//            }
-//        }
-
-
-//        //RGV鍙拌溅浣嶇疆
-//        Thread.sleep(200);
-//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.0",(short)4);
-//        if (result3.IsSuccess) {
-//            for (int i = 0; i < 2; i++) {
-//                Integer siteId = i==0 ? 1 : 2; // 绔欑偣缂栧彿
-//                StaProtocol staProtocol = station.get(siteId);
-//                if (null == staProtocol) {
-//                    staProtocol = new StaProtocol();
-//                    staProtocol.setSiteId(siteId);
-//                    station.put(siteId, staProtocol);
-//                }
-//                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2)));
-////                String aa = staProtocol.getNearbySta();
-////                System.out.println(siteId + "===>>" + staProtocol.getNearbySta());
-//            }
-//        }
-
-//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
-//        if (result2.IsSuccess) {
-//            this.ioMode = IoModeType.get(result2.Content);
-//        }
-
-        if (result.IsSuccess) {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
-
-            // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
-            try {
-                List<BasDevp> basDevps = new ArrayList<>();
-                for (Integer siteId : staNos) {
-                    StaProtocol staProtocol = station.get(siteId);
-                    basDevps.add(staProtocol.toSqlModel());
-                }
-
-                BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
-                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
-                    throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-                log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-            }
-
-            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-            deviceErrorService.deleteDeviceError("devp", slave.getId());
-        } else {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-//            log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
-            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-            deviceErrorService.addDeviceError("devp", slave.getId(), "璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐�");
-        }
-    }
-
-    /**
-     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
-     */
-    private void writeAgvOk(StaProtocol staProtocol) throws InterruptedException {
-        if (null == staProtocol) {
-            return;
-        }
-        ArrayList<Integer> staNos = getStaNo();
-        int index = staNos.indexOf(staProtocol.getSiteId());
-        if (staProtocol.getAgvTypeSign() == 0 || staProtocol.getAgvTypeSign() == 2) {  //0鍙栬揣
-            switch (staProtocol.getSiteId()) {
-                case 100:
-                    index = 32;
-                    break;
-                case 101:
-                    index = 34;
-                    break;
-                case 102:
-                    index = 38;
-                    break;
-                case 103:
-                    index = 40;
-                    break;
-                case 104:
-                    index = 44;
-                    break;
-                case 105:
-                    index = 46;
-                    break;
-                case 106:
-                    index = 50;
-                    break;
-                case 107:
-                    index = 52;
-                    break;
-                default:
-                    return;
-            }
-        } else {
-            switch (staProtocol.getSiteId()) {
-                case 100:
-                    index = 30;
-                    break;
-                case 102:
-                    index = 36;
-                    break;
-                case 104:
-                    index = 42;
-                    break;
-                case 106:
-                    index = 48;
-                    break;
-                default:
-                    return;
-            }
-        }
-
-        OperateResult write = null;
-        //浠诲姟涓嬪彂娆℃暟
-        int writeCount = 0;
-        do {
-            short textWrite = 1;// 浠诲姟瀹屾垚
-            if (staProtocol.getAgvTypeSign() > 1) {
-                textWrite = 0;// 浠诲姟澶嶄綅
-            }
-            write = siemensS7Net.Write("DB102." + index, textWrite);
-            if (write.IsSuccess) {
-                writeCount = 6;
-            } else {
-                writeCount++;
-                log.error("鍐欏叆杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠ゅ悗璇诲彇澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-            }
-        } while (writeCount < 5);
-
-        if (!write.IsSuccess) {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-            log.error("鍐欏叆杈撻�佺嚎鍙栨斁璐у畬鎴愮珯鐐规暟鎹け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
-        } else {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-            log.info("杈撻�佺嚎鍙栨斁璐у畬鎴愬懡浠や笅鍙戠爜鍨涘畬鎴�  缁欒緭閫佺嚎鍐欎换鍔″畬鎴� [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
-        }
-
-
-    }
-
-    private void write(StaProtocol staProtocol) throws InterruptedException {
-        if (staProtocol == null) {
-            return;
-        }
-
-        ArrayList<Integer> staNos = getStaNo();
-        int index = staNos.indexOf(staProtocol.getSiteId());
-
-        if (index == -1) {
-            log.error("绔欑偣缂栧彿 {} 涓嶅湪宸茬煡鍒楄〃涓紝鏃犳硶鍐欏叆浠诲姟锛�", staProtocol.getSiteId());
-            return;
-        }
-
-        int writeCount = 0; // 浠诲姟涓嬪彂灏濊瘯娆℃暟
-        boolean writeFlag = false; // 浠诲姟涓嬪彂鎴愬姛鏍囪
-        String plcAddressWorkNo = "DB100." + index * 6;
-        String plcAddressStaNo = "DB100." + (index * 6 + 4);
-        Thread.sleep(100);
-        while (writeCount < 5) {
-            // **璇诲彇褰撳墠PLC鐘舵�侊紝閬垮厤涓嶅繀瑕佺殑鍐欏叆**
-            OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
-            if (readResult.IsSuccess) {
-                int currentWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
-                short currentStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
-
-                if (currentWorkNo == staProtocol.getWorkNo().intValue() && currentStaNo == staProtocol.getStaNo()) {
-                    log.info("绔欑偣 {} 褰撳墠鐘舵�佸凡鍖归厤锛屾棤闇�閲嶅鍐欏叆", staProtocol.getSiteId());
-                    return;
-                }
-            }
-
-            // **娓呴浂骞剁‘璁�**
-            if (!clearPLCData(plcAddressWorkNo, plcAddressStaNo, staProtocol.getSiteId())) {
-                writeCount++;
-                continue; // 閲嶆柊灏濊瘯娓呴浂
-            }
-
-            // **鍐欏叆鏂颁换鍔�**
-            if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
-                writeFlag = true;
-                log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                break;
-            }
-
-            log.warn("杈撻�佺嚎鍛戒护鍐欏叆澶辫触锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-            writeCount++;
-        }
-
-        // **鍐欏叆澶辫触澶勭悊**
-        handleWriteFailure(staProtocol, writeFlag);
-    }
-
-    private void writeCycle(StaProtocol staProtocol) throws InterruptedException {
-        if (staProtocol == null) {
-            return;
-        }
-
-        ArrayList<Integer> staNos = getStaNo();
-        int index = staNos.indexOf(staProtocol.getSiteId());
-
-        if (index == -1) {
-            log.error("绔欑偣缂栧彿 {} 涓嶅湪宸茬煡鍒楄〃涓紝鏃犳硶鍐欏叆浠诲姟锛�", staProtocol.getSiteId());
-            return;
-        }
-
-        int writeCount = 0; // 浠诲姟涓嬪彂灏濊瘯娆℃暟
-        boolean writeFlag = false; // 浠诲姟涓嬪彂鎴愬姛鏍囪
-        String plcAddressWorkNo = "";
-        String plcAddressStaNo = "";
-        switch (staProtocol.getSiteId()) {
-            case 105:
-                plcAddressWorkNo = "DB73." + 0;
-                plcAddressStaNo = "DB73." + 4;
-                break;
-            case 106:
-                plcAddressWorkNo = "DB73." + 6;
-                plcAddressStaNo = "DB73." + (6 + 4);
-                break;
-            case 108:
-                plcAddressWorkNo = "DB73." + 2 * 6;
-                plcAddressStaNo = "DB73." + (2 * 6 + 4);
-                break;
-            case 110:
-                plcAddressWorkNo = "DB73." + 3 * 6;
-                plcAddressStaNo = "DB73." + (3 * 6 + 4);
-                break;
-            case 112:
-                plcAddressWorkNo = "DB73." + 4 * 6;
-                plcAddressStaNo = "DB73." + (4 * 6 + 4);
-                break;
-        }
-
-
-        // **鍐欏叆鏂颁换鍔�**
-        if (writeTaskToPLC(plcAddressWorkNo, plcAddressStaNo, staProtocol)) {
-            writeFlag = true;
-            log.info("杈撻�佺嚎鍛戒护鍐欏叆鎴愬姛锛孭LC缂栧彿={}锛岀珯鐐规暟鎹�={}锛屽皾璇曟鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-        }
-
-        // **鍐欏叆澶辫触澶勭悊**
-        handleWriteFailure(staProtocol, writeFlag);
-    }
-
-    /**
-     * 娓呴浂 PLC 鏁版嵁骞堕獙璇佹竻闆舵槸鍚︽垚鍔�
-     */
-    private boolean clearPLCData(String plcAddressWorkNo, String plcAddressStaNo, int siteId) throws InterruptedException {
-        siemensS7Net.Write(plcAddressWorkNo, 0);
-        siemensS7Net.Write(plcAddressStaNo, (short) 0);
-        Thread.sleep(100); // 绛夊緟PLC璇嗗埆
-
-        OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
-        if (readResult.IsSuccess) {
-            int readWorkNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
-            short readStaNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
-            if (readWorkNo == 0 && readStaNo == 0) {
-                return true; // 娓呴浂鎴愬姛
-            }
-        }
-
-        log.warn("绔欑偣 {} 娓呴浂澶辫触锛屽皾璇曢噸鏂版竻闆�...", siteId);
-        return false;
-    }
-
-    /**
-     * 鍐欏叆鏂颁换鍔″埌 PLC 骞堕獙璇佹槸鍚︽垚鍔�
-     */
-    private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, StaProtocol staProtocol) throws InterruptedException {
-        OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, staProtocol.getStaNo());
-
-        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, staProtocol.getWorkNo().intValue());
-
-        if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
-            Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板��
-            OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
-            if (readResult.IsSuccess) {
-                int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
-                short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
-                return workNo == staProtocol.getWorkNo().intValue() && staNo == staProtocol.getStaNo();
-            }
-        }
-        return false;
-    }
-
-    private boolean writeTaskToPLC(String plcAddressWorkNo, String plcAddressStaNo, Cycle cycle) throws InterruptedException {
-        OperateResult writeResult1 = siemensS7Net.Write(plcAddressWorkNo, cycle.getWorkNo().intValue());
-        OperateResult writeResult2 = siemensS7Net.Write(plcAddressStaNo, cycle.getStaNo());
-
-        if (writeResult1.IsSuccess && writeResult2.IsSuccess) {
-            Thread.sleep(200); // 绛夊緟 PLC 璇嗗埆鏂板��
-            OperateResultExOne<byte[]> readResult = siemensS7Net.Read(plcAddressWorkNo, (short) 6);
-            if (readResult.IsSuccess) {
-                int workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
-                short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 4);
-                return workNo == cycle.getWorkNo().intValue() && staNo == cycle.getStaNo();
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 澶勭悊鍐欏叆澶辫触鐨勬儏鍐�
-     */
-    private void handleWriteFailure(StaProtocol staProtocol, boolean writeFlag) {
-        if (!writeFlag) {
-            StaProtocol currentStaProtocol = station.get(staProtocol.getSiteId());
-            if (currentStaProtocol.getWorkNo() == 0 && currentStaProtocol.getStaNo() == 0) {
-                currentStaProtocol.setPakMk(true);
-            }
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�侾LC缂栧彿={1}锛岀珯鐐规暟鎹�={2}",
-                    slave.getId(), JSON.toJSON(currentStaProtocol)));
-            log.error("杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ワ紝PLC缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(currentStaProtocol));
-        } else {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣緭閫佺嚎鍛戒护鎴愬姛 [id:{1}] >>>>> {2}",
-                    DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-            log.info("杈撻�佺嚎鍛戒护鎴愬姛 [id:{}] >>>>> {}", slave.getId(), JSON.toJSON(staProtocol));
-        }
     }
 
 
-    private void write2(StaProtocol staProtocol) throws InterruptedException {
-        if (null == staProtocol) {
-            return;
-        }
-        ArrayList<Integer> staNos = getStaNo();
-
-        int index = staNos.indexOf(staProtocol.getSiteId());
-        short[] array = new short[2];
-        array[0] = staProtocol.getWorkNo();
-        array[1] = staProtocol.getStaNo();
-
-        OperateResult writeResult;
-        //浠诲姟涓嬪彂娆℃暟
-        int writeCount = 0;
-        //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
-        boolean writeFlag = false;
-        while (writeCount < 5) {
-            writeResult = siemensS7Net.Write("DB100." + index * 4, array);    // 宸ヤ綔鍙枫�佺洰鏍囩珯
-
-            if (writeResult.IsSuccess) {
-                Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index * 4, (short) 4);
-                if (readResult.IsSuccess) {
-                    short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-                    short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 2);
-                    if (staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)) {
-                        //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                        writeFlag = true;
-                        log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
-                        Date now = new Date();
-                        break;
-                    } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
-                        writeCount++;
-                        OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
-                                slave.getId(), JSON.toJSON(staProtocol), writeCount));
-                        log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
-                    }
-                } else {
-                    writeCount++;
-                    OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
-                            slave.getId(), JSON.toJSON(staProtocol), writeCount));
-                    log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
-                }
-            } else {
-                writeCount++;
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2},鍐欏叆娆℃暟={3}",
-                        slave.getId(), JSON.toJSON(staProtocol), writeCount));
-                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-
-            }
-            Thread.sleep(200);
-        }
-
-        //鍐欏懡浠ゅ皾璇曚簡5娆¤繕鏄け璐ヤ簡
-        if (!writeFlag) {
-            staProtocol = station.get(staProtocol.getSiteId());
-            if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0) {
-                staProtocol.setPakMk(true);
-            }
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-            log.error("鍐欏叆杈撻�佺嚎鍛戒护灏濊瘯5娆″け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
-
-            //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔¢槦鍒�
-            boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(3, staProtocol));
-            read();//璇诲彇1娆¤澶囩姸鎬�
-            return;
-        } else {
-            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-            //log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
-
-            Integer siteId = staProtocol.getSiteId();
-            staProtocol = station.get(siteId);
-            if ((siteId == 101 || siteId == 201) && (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() == 0)) {
-                staProtocol.setPakMk(true);
-            }
-
-        }
-
-    }
-
-//    /**
-//     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
-//     */
-//    private void write(StaProtocol staProtocol) throws InterruptedException {
-//        if (null == staProtocol) {
-//            return;
-//        }
-//        int index = staNos.indexOf(staProtocol.getSiteId());
-//        short[] array = new short[2];
-//        array[0] = staProtocol.getWorkNo();
-//        array[1] = staProtocol.getStaNo();
-//        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
-//
-////        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-////        Thread.sleep(500);
-////        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
-//
-//        if (!write.IsSuccess) {
-//            staProtocol = station.get(staProtocol.getSiteId());
-//            if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
-//                staProtocol.setPakMk(true);
-//            }
-//            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
-//            log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
-//        } else {
-//            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-//            log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
-//
-//            Integer siteId = staProtocol.getSiteId();
-//            staProtocol = station.get(siteId);
-//            if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
-//                staProtocol.setPakMk(true);
-//            }
-//        }
-//    }
-
-    // 鏇存柊鍏ュ嚭搴撴ā寮�
-    private void updateIoMode() throws InterruptedException {
-        if (this.ioModeOf2F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                log.error("鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
-            }
-        }
-    }
-
-    /**
-     * 蹇冭烦
-     */
-    private void heartbeat() {
-        if (heartBeatVal == 1) {
-            heartBeatVal = 2;
-        } else {
-            heartBeatVal = 1;
-        }
-        OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
-        if (!write.IsSuccess) {
-            log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
-        }
-    }
-
-    /**
-     * 璁剧疆鍏ュ簱鏍囪
-     */
     @Override
-    public void setPakMk(Integer siteId, boolean pakMk) {
-        StaProtocol staProtocol = station.get(siteId);
-        if (null != staProtocol) {
-            staProtocol.setPakMk(pakMk);
-        }
+    public boolean connect() {
+        return false;
     }
 
     @Override
     public void close() {
-        siemensS7Net.ConnectClose();
+
     }
 
-    public static void main(String[] args) {
-        ArrayList<Integer> staNos = staNos1;
-        System.out.println(staNos.indexOf(129));
-        System.out.println(staNos.size());
-        for (int i = 0; i < staNos.size(); i++) {
-//            System.out.println(i*2);
-//            System.out.println(i*2 + 200);
-//            System.out.println(i);
-        }
-        int index = staNos.indexOf(128);
-        System.out.println(index * 2);
-        System.out.println(index * 2 + 200);
+
+    @Override
+    public void setPakMk(Integer siteId, boolean pakMk) {
+
     }
 
-//    public static void main(String[] args) throws Exception {
-//        DevpSlave slave = new DevpSlave();
-//        slave.setIp("192.168.2.125");
-//        SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-//        devpThread.connect();
-//        devpThread.read();
-//        // 鍐�
-//        StaProtocol staProtocol = devpThread.getStation().get(1);
-//        staProtocol.setWorkNo((short) 232);
-//        staProtocol.setStaNo((short) 6);
-//        staProtocol.setAutoing(true);
-//        staProtocol.setEmptyMk(true);
-//        staProtocol.setInEnable(true);
-//        devpThread.write(staProtocol);
-//        System.out.println("----------------------------------------");
-//        // 璇�
-//        devpThread.read();
-//        System.out.println(JSON.toJSONString(devpThread.station));
-//
-//    }
+    @Override
+    public void run() {
 
+    }
 }

--
Gitblit v1.9.1