From 4cd0f495beb0cca53a6c49c4e8ccdacad10c6961 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期一, 14 七月 2025 17:18:16 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  498 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 450 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 44a5806..356307c 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -20,6 +20,7 @@
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.Task;
 import com.zy.core.model.protocol.StaProtocol;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
@@ -49,7 +50,7 @@
         add(112);add(113);add(114);add(115);
         add(116);add(117);add(118);add(119);
         add(120);add(121);add(122);add(123);
-        add(124);add(125);add(126);add(127);
+//        add(124);add(125);add(126);add(127);
         add(130);add(131);
         add(132);add(133);add(134);add(135);
         add(136);add(137);add(138);add(139);
@@ -57,21 +58,31 @@
         add(144);add(145);add(146);add(147);
         add(148);add(149);add(150);add(151);
         add(152);add(153);
+        add(170);
+        add(171);
     }};
     public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
         add(200);add(201);add(202);add(203);
         add(204);add(205);add(206);add(207);
         add(208);add(209);add(210);add(211);
-        add(212);
-        add(213);add(214);add(215);add(216);
-        add(217);add(218);add(219);add(220);
-        add(221);add(222);
+        add(212);add(213);add(214);add(215);
+        add(216);add(217);add(218);add(219);
+        add(220);add(221);add(222);add(2000);
     }};
+
+    public static final ArrayList<Integer> staNos1Super = new ArrayList<Integer>() {{
+        add(118);add(119);add(120);add(121);add(122);add(123);add(131);add(135);add(147);
+    }};
+
+    public static final ArrayList<Integer> staNos2Super = new ArrayList<Integer>() {{
+        add(213);
+    }};
+
 
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 1;
+    private int barcodeSize = 5;
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -85,6 +96,9 @@
 //    public IoModeType ioMode = IoModeType.NONE;
     public IoModeType ioModeOf4F = IoModeType.NONE;
 //    public IoModeType ioMode = IoModeType.NONE;
+
+
+    private boolean connectDev = false;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -101,10 +115,121 @@
         }
     }
 
+    private ArrayList<Integer> getStaNoSuper() {
+        switch (slave.getId()) {
+            case 1:
+                return staNos1Super;
+            case 2:
+                return staNos2Super;
+            default:
+                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        }
+    }
+
     @Override
     @SuppressWarnings("InfiniteLoopStatement")
     public void run() {
-        connect();
+        connectDev = this.connect();
+        while(!connectDev){
+            try {
+                connectDev = this.connect();
+                Thread.sleep(100);
+            } catch (Exception e){
+
+            }
+        }
+
+        // 鍚姩绾跨▼鑷姩閲嶈繛
+        new Thread(this::devConnect).start();
+
+        // 鍚姩璇绘暟鎹嚎绋�
+        new Thread(this::readStatusDev).start();
+
+        // 鍚姩浠诲姟涓嬪彂绾跨▼
+        new Thread(this::writeStatusDev).start();
+
+    }
+
+    /**
+     * 鍒濆鍖栫珯鐐圭姸鎬�
+     */
+    private void initSite() {
+        try{
+            ArrayList<Integer> staNos = getStaNo();
+            // 绔欑偣缂栧彿
+            for (Integer siteId : staNos) {
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                staProtocol.setSiteId(siteId);
+                staProtocol.setWorkNo(0);    // ID
+                staProtocol.setAutoing(false);      // 鑷姩
+                staProtocol.setLoading(false);      // 鏈夌墿
+                staProtocol.setInEnable(false);     // 鍙叆
+                staProtocol.setOutEnable(false);    // 鍙嚭
+                staProtocol.setEmptyMk(false);      // 绌烘澘淇″彿
+                staProtocol.setStaNo(0);     // 鐩爣绔�
+
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+
+
+            // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+            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());
+            }
+        } catch (Exception e){
+            try{
+                log.error(e.getMessage());
+            } catch (Exception e1){
+
+            }
+            log.error("鍒濆鍖栫珯鐐圭姸鎬佸紓甯�");
+        }
+    }
+
+
+
+    private void devConnect() {
+        while (true) {
+            try {
+                Thread.sleep(1000L);
+                if(!connectDev){
+                    try {
+                        connectDev = this.connect();
+                        Thread.sleep(100L);
+                    } catch (Exception e){
+
+                    }
+                }
+            } catch (Exception e) {
+
+                log.error("rgv杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+                initSite();
+//                e.printStackTrace();
+            }
+        }
+    }
+
+    private void writeStatusDev() {
         while (true) {
             try {
                 int step = 1;
@@ -115,10 +240,25 @@
                 switch (step) {
                     // 璇绘暟鎹�
                     case 1:
-                        read();
+//                        read();
                         break;
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
+                        write((StaProtocol)task.getData());
+                        break;
+                    // 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚  缁欒緭閫佺嚎鍐欎换鍔″畬鎴�
+                    case 3:
+                        write3((StaProtocol)task.getData());
+                        break;
+                    // 鍐欐暟鎹� ID+鐩爣绔� 鐮佸灈瀹屾垚  缁欒緭閫佺嚎鍐欎换鍔″畬鎴愬浣�
+                    case 4:
+                        write4((StaProtocol)task.getData());
+                        break;
+                    case 5:
+                        write3((StaProtocol)task.getData());
+                        Thread.sleep(400);
+                        write4((StaProtocol)task.getData());
+                        Thread.sleep(400);
                         write((StaProtocol)task.getData());
                         break;
                     default:
@@ -128,10 +268,44 @@
 //                heartbeat();
                 Thread.sleep(400);
             } catch (Exception e) {
-                e.printStackTrace();
+//                e.printStackTrace();
+                try{
+                    log.error("dev鍐欑嚎绋嬪紓甯�"+e.getMessage());
+
+                } catch (Exception e1){
+
+                }
+                log.error("DEV鏁版嵁鍐欏叆绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
             }
 
         }
+
+    }
+    private void readStatusDev() {
+        while (true) {
+            try {
+                if(!connectDev){
+                    try {
+                        Thread.sleep(1000L);
+                    } catch (Exception e){
+
+                    }
+                    continue;
+                }
+                Thread.sleep(200);
+                read();
+
+            } catch (Exception e) {
+                log.error("RGV璇荤嚎绋嬪紓甯�"+e.getMessage());
+
+                log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+                initSite();
+//                e.printStackTrace();
+            }
+
+        }
+
     }
 
     @Override
@@ -160,20 +334,80 @@
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
         ArrayList<Integer> staNos = getStaNo();
+        ArrayList<Integer> staNoSuper = getStaNoSuper();
         int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
+        int staNoSuperSize = staNoSuper.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); // 绔欑偣缂栧彿
+                if (siteId==119){
+                    StaProtocol staProtocol = station.get(siteId);
+                    if (null == staProtocol) {
+                        staProtocol = new StaProtocol();
+                        staProtocol.setSiteId(siteId);
+                        station.put(siteId, staProtocol);
+                    }
+                    staProtocol.setWorkNo(0);     // 宸ヤ綔鍙�
+
+                    staProtocol.setStaNo(0);   // 鐩爣绔�
+
+                    boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8 + 6, 2);
+                    staProtocol.setAutoing(false);  // 鑷姩
+                    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]);      // 浣庡簱浣�
+                    continue;
+                }
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
                     staProtocol = new StaProtocol();
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i*8));     // 宸ヤ綔鍙�
 
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
+                staProtocol.setStaNo((int)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]);      // 浣庡簱浣�
+                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+                    staProtocol.setPakMk(true);
+                }
+            }
+        }
+
+        Thread.sleep(200);
+        OperateResultExOne<byte[]> resultError = siemensS7Net.Read("DB101.800", (short) (8));
+        if (resultError.IsSuccess && staNoSize==staNos2.size()) {
+            ArrayList<Integer> staNoError = new ArrayList<Integer>() {{ add(217);add(221); }};
+            for (int i = 0; i < staNoError.size(); i++) {
+                Integer siteId = staNoError.get(i); // 绔欑偣缂栧彿
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultError.Content, i*4 + 2, 1);
+                staProtocol.setFrontErr(status[0]);// 鍓嶈秴闄�
+                staProtocol.setBackErr(status[1]);// 鍚庤秴闄�
+                staProtocol.setHighErr(status[2]);// 楂樿秴闄�
+                staProtocol.setLeftErr(status[3]);// 宸﹁秴闄�
+                staProtocol.setRightErr(status[4]);// 鍙宠秴闄�
+                staProtocol.setWeightErr(status[5]); // 瓒呴噸
+                staProtocol.setBarcodeErr(status[6]);// 鎵爜澶辫触
             }
         }
 //        Thread.sleep(200);
@@ -190,34 +424,34 @@
 //                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
 //            }
 //        }
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize * 2));
-        if (result1.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
-                StaProtocol staProtocol = station.get(siteId);
-                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]);      // 浣庡簱浣�
-
-                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
-                    staProtocol.setPakMk(true);
-                }
-            }
-        }
+//        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize * 2));
+//        if (result1.IsSuccess) {
+//            for (int i = 0; i < staNoSize; i++) {
+//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+//                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+//                StaProtocol staProtocol = station.get(siteId);
+//                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]);      // 浣庡簱浣�
+//
+//                if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+//                    staProtocol.setPakMk(true);
+//                }
+//            }
+//        }
 
         //鏉$爜鎵弿鍣�
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.150",(short)(barcodeSize*8));
-        if (result2.IsSuccess) {
-            for (int i = 0; i < barcodeSize; i++) {
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840",(short)(barcodeSize*8));
+        if (result2.IsSuccess && staNoSize==staNos2.size()) {
+            for (int i = 0; i < barcodeSize; i++) {  //1:217  2:221  3:null 4:215  5:219
+                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
                 BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);
@@ -228,8 +462,8 @@
         //RGV灏忚溅
         Thread.sleep(200);
         OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
-        if (result3.IsSuccess) {
-            Integer siteId = 16;
+        if (result3.IsSuccess && staNoSize==staNos2.size()) {
+            Integer siteId = 2000;
             StaProtocol staProtocol = station.get(siteId);
             if (null == staProtocol) {
                 staProtocol = new StaProtocol();
@@ -239,9 +473,25 @@
             staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
         }
 
+        //绔欑偣瓒呯骇鏈夌墿淇″彿
+        Thread.sleep(200);
+        OperateResultExOne<byte[]> resultStaSuper = siemensS7Net.Read("DB101.1320",(short)(staNoSuperSize*2));
+        if (resultStaSuper.IsSuccess) {
+            for (int i = 0; i < staNoSuperSize; i++) {
+                Integer siteId = staNoSuper.get(i); // 绔欑偣缂栧彿
+                StaProtocol staProtocol = station.get(siteId);
+                if (null == staProtocol) {
+                    staProtocol = new StaProtocol();
+                    staProtocol.setSiteId(siteId);
+                    station.put(siteId, staProtocol);
+                }
+                short loadingSuper = siemensS7Net.getByteTransform().TransInt16(resultStaSuper.Content, i * 2);
+                staProtocol.setLoadingSuper(loadingSuper==0);   // 鐩爣绔�
+            }
+        }
 
 
-        if (result.IsSuccess && result1.IsSuccess) {
+        if (result.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -266,6 +516,7 @@
         } 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());
+            initSite();
         }
     }
 
@@ -278,16 +529,28 @@
         }
         ArrayList<Integer> staNos = getStaNo();
         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);
+//        int[] array = new int[2];
+//        array[0] = staProtocol.getWorkNo();
+//        array[1] = staProtocol.getStaNo();
+//        OperateResult write = siemensS7Net.Write("DB100." + index*8, array);
 
-//        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-//        Thread.sleep(500);
-//        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
+        OperateResult write = null;
+        OperateResult write1 = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            Thread.sleep(500);
+            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
+            if(write.IsSuccess || write1.IsSuccess){
+                writeCount=6;
+            }else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
 
-        if (!write.IsSuccess) {
+        if (!write.IsSuccess || !write1.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
             if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
                 staProtocol.setPakMk(true);
@@ -300,6 +563,134 @@
         }
     }
 
+
+    /**
+     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�   鐮佸灈瀹屾垚  缁欒緭閫佺嚎鍐欎换鍔″畬鎴�
+     */
+    private void write3(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+        Integer siteId = staProtocol.getSiteId();
+        Integer index =0;
+        switch (siteId){
+            case 118:
+                index=0;
+                break;
+            case 171:
+                index=1;
+                break;
+            case 120:
+                index=2;
+                break;
+            case 121:
+                index=3;
+                break;
+            case 131:
+                index=4;
+                break;
+            case 135:
+                index=5;
+                break;
+            case 147:
+                index=6;
+                break;
+            default:
+                return;
+        }
+
+        OperateResult write = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100.600." + index, true);    // 浠诲姟瀹屾垚
+            if(write.IsSuccess){
+                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.600." + index, (short) 1);
+                if(readResult.IsSuccess){
+                    boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readResult.Content, 0, 1);
+                    if (booleans[0]){
+                        writeCount=6;
+                    }else {
+                        writeCount++;
+                        log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                    }
+                }
+            }else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
+
+        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));
+        }
+    }
+
+    private void write4(StaProtocol staProtocol) throws InterruptedException {
+        if (null == staProtocol) {
+            return;
+        }
+        Integer siteId = staProtocol.getSiteId();
+        Integer index =0;
+        switch (siteId){
+            case 118:
+                index=0;
+                break;
+            case 171:
+                index=1;
+                break;
+            case 120:
+                index=2;
+                break;
+            case 121:
+                index=3;
+                break;
+            case 131:
+                index=4;
+                break;
+            case 135:
+                index=5;
+                break;
+            case 147:
+                index=6;
+                break;
+            default:
+                return;
+        }
+
+        OperateResult write = null;
+        //浠诲姟涓嬪彂娆℃暟
+        int writeCount = 0;
+        do {
+            write = siemensS7Net.Write("DB100.600." + index, false);    // 浠诲姟瀹屾垚澶嶄綅
+            if(write.IsSuccess){
+                writeCount=6;
+            }else {
+                writeCount++;
+                log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+            }
+        }while (writeCount<5);
+
+        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));
+        }
+    }
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
         if (this.ioModeOf2F != IoModeType.NONE) {
@@ -336,6 +727,17 @@
         }
     }
 
+    /**
+     * 璁剧疆鍏ュ簱鏍囪
+     */
+    @Override
+    public void setReportSign(Integer siteId, boolean pakMk) {
+        StaProtocol staProtocol = station.get(siteId);
+        if (null != staProtocol) {
+            staProtocol.setReportSign(pakMk);
+        }
+    }
+
     @Override
     public void close() {
         siemensS7Net.ConnectClose();

--
Gitblit v1.9.1