From ed265ddfb8f08f69af064a9adf65fcbf06289ffe Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 11 二月 2025 14:07:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  339 ++-----------------------------------------------------
 1 files changed, 17 insertions(+), 322 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6273d86..e3e3703 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -41,20 +41,12 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-    private int barcodeSize = 1;
+    private int barcodeSize = 10;
+
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(100);add(101);add(102);
-        add(103);add(104);add(105);
-        add(106);add(107);add(108);
+        add(100);add(101);
+        add(102);add(103);
     }};
-
-    public static final ArrayList<Integer> outInStaNos = new ArrayList<Integer>() {{
-        add(102);add(105);add(106);
-        add(107);add(108);
-    }};
-
-    public boolean charge0;
-    public boolean charge1;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -81,21 +73,12 @@
                         write((StaProtocol) task.getData());
                         read();
                         break;
-                    // 鍑哄叆搴撴ā寮�
-                    case 3:
-                        write3((StaProtocol) task.getData());
-                        read();
-                        break;
-                    //102绔欏洖閫�淇″彿
-                    case 5:
-                        write5((StaProtocol) task.getData());
-                        read();
                     default:
                         break;
                 }
                 // 蹇冭烦
 //                heartbeat();
-                Thread.sleep(400);
+                Thread.sleep(100);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -118,7 +101,7 @@
             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()));
             News.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
-        siemensS7Net.ConnectClose();
+//        siemensS7Net.ConnectClose();
         return result;
     }
 
@@ -126,7 +109,7 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNos.size()*4));
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB1000.0", (short) (staNos.size()*4));
         if (result.IsSuccess) {
             for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -140,12 +123,13 @@
                 staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4+2));   // 鐩爣绔�
             }
         }
+
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNos.size()));
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB1001.0", (short) (staNos.size()*2));
         if (result1.IsSuccess) {
             for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
                 StaProtocol staProtocol = station.get(siteId);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
@@ -162,79 +146,6 @@
             }
         }
 
-        //璇绘潯鐮�
-        Thread.sleep(100);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)24);
-        if (result2.IsSuccess) {
-            for (int i = 0; i <= barcodeSize; i++) {
-//                byte[] bytes = siemensS7Net.getByteTransform().TransByte(result2.Content, i * 8, 8);
-//                String barcode = CommonUtils.bytesToBarcode(bytes);
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                    barcodeThread.setBarcode(barcode);
-                }
-            }
-        }
-
-        // 鍏呯數淇″彿浣�1
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result32 = siemensS7Net.Read("DB102.109", (short)1);
-        if (result32.IsSuccess) {
-            boolean[] status = siemensS7Net.getByteTransform().TransBool(result32.Content, 0, 1);
-            charge0 = status[0];  //1:鍙互鍏呯數   0锛氬彲鑳界绾� 鍙兘鍦ㄥ厖鐢�
-        }
-        // 鍏呯數淇″彿浣�2
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result31 = siemensS7Net.Read("DB100.201", (short)1);
-        if (result31.IsSuccess) {
-            boolean[] status = siemensS7Net.getByteTransform().TransBool(result31.Content, 0, 1);
-            charge1 = status[0];
-        }
-
-        // 澶栧舰妫�娴� - 102
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result102 = siemensS7Net.Read("DB100.100", (short)2);
-        if (result102.IsSuccess) {
-            //鍑哄叆搴撴ā寮�
-            short outInModel = siemensS7Net.getByteTransform().TransInt16(result102.Content, 0);
-            StaProtocol staProtocol = station.get(102);
-            staProtocol.setOutInModel(outInModel);
-        }
-
-        Thread.sleep(50);
-        for (Integer siteId : outInStaNos) {
-            String dbAddress = "DB100.300";
-            switch (siteId) {
-                case 102:
-                    dbAddress = "DB100.300";
-                    break;
-                case 105:
-                    dbAddress = "DB100.302";
-                    break;
-                case 106:
-                    dbAddress = "DB100.304";
-                    break;
-                case 107:
-                    dbAddress = "DB100.306";
-                    break;
-                case 108:
-                    dbAddress = "DB100.308";
-                    break;
-            }
-
-            OperateResultExOne<byte[]> resultRead = siemensS7Net.Read(dbAddress, (short) 2);
-            if (resultRead.IsSuccess) {
-                //閾炬潯杞姩鎯呭喌
-                short direction = siemensS7Net.getByteTransform().TransInt16(resultRead.Content, 0);
-                StaProtocol staProtocol = station.get(siteId);
-                if (direction != 0 && !staProtocol.isLoading()) {
-                    //鐘舵�佷负姝h浆鎴栧弽杞笖鏃犵墿鏃讹紝灏嗛摼鏉¤浆鍔ㄤ俊鍙蜂綅澶嶄綅
-                    write4(siteId, 0);
-                }
-            }
-        }
-
         if (result.IsSuccess && result1.IsSuccess) {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -244,6 +155,7 @@
                 for (Integer siteId : staNos) {
                     StaProtocol staProtocol = station.get(siteId);
                     basDevps.add(staProtocol.toSqlModel());
+//                    log.info("杈撻�佺嚎淇″彿锛寋}", JSON.toJSONString(staProtocol));
                 }
                 BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
                 if (!basDevpService.updateBatchById(basDevps)) {
@@ -258,136 +170,6 @@
             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()));
 //            News.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
         }
-    }
-
-    /**
-     * plc涓庢彁鍗囨満浜や簰
-     */
-    private void write4(Integer siteId, Integer direction) throws InterruptedException {
-        if (Cools.isEmpty(siteId, direction)) {
-            return;
-        }
-        switch (siteId) {
-            case 102:
-                siemensS7Net.Write("DB100.300", direction.shortValue());
-                break;
-            case 105:
-                siemensS7Net.Write("DB100.302", direction.shortValue());
-                break;
-            case 106:
-                siemensS7Net.Write("DB100.304", direction.shortValue());
-                break;
-            case 107:
-                siemensS7Net.Write("DB100.306", direction.shortValue());
-                break;
-            case 108:
-                siemensS7Net.Write("DB100.308", direction.shortValue());
-                break;
-        }
-    }
-
-    /**
-     * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
-     */
-    private void write3(StaProtocol staProtocol) throws InterruptedException {
-        if (Cools.isEmpty(staProtocol)) {
-            return;
-        }
-        OperateResult writeResult = null;
-        //浠诲姟涓嬪彂娆℃暟
-        int writeCount = 0;
-        //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
-        boolean writeFlag = false;
-
-        Short outAndIn = staProtocol.getOutInModel();
-        Integer siteId = staProtocol.getSiteId();
-        Short run = 0;//鍋滄杞姩
-        String address = "";
-        if (staProtocol.getRotationDire() != null) {
-            run = staProtocol.getRotationDire().shortValue();//杞姩鏂瑰悜
-        }
-        switch (siteId) {
-            case 102:
-                address = "DB100.300";
-                break;
-            case 105:
-                address = "DB100.302";
-                break;
-            case 106:
-                address = "DB100.304";
-                break;
-            case 107:
-                address = "DB100.306";
-                break;
-            case 108:
-                address = "DB100.308";
-                break;
-        }
-
-        while(writeCount < 5){
-            writeResult = siemensS7Net.Write(address, run);
-            if (writeResult == null) {
-                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                continue;
-            }
-
-            if(writeResult.IsSuccess){
-                Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read(address, (short) 2);
-                if(readResult.IsSuccess){
-                    short run2 = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-                    if(run.equals(run2)){
-                        //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                        writeFlag = true;
-                        if (staProtocol.getStaNo() != null && staProtocol.getWorkNo() != null) {
-                            write(staProtocol);//鍐欏叆宸ヤ綔鍙峰拰鐩爣绔�
-                        }
-                        log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                        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));
-
-            staProtocol = station.get(siteId);
-            if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
-                staProtocol.setPakMk(true);
-            }
-        }
-
     }
 
     /**
@@ -410,11 +192,11 @@
         int writeCount = 0;
         //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
         boolean writeFlag = false;
-        while(writeCount < 5){
-            writeResult = siemensS7Net.Write("DB100." + index*4, array);    // 宸ヤ綔鍙枫�佺洰鏍囩珯
+        while(writeCount < 1){
+            writeResult = siemensS7Net.Write("DB1000." + index*4, array);    // 宸ヤ綔鍙枫�佺洰鏍囩珯
             if(writeResult.IsSuccess){
-                Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*4, (short)4);
+                Thread.sleep(500);
+                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB1000." + index*4, (short)4);
                 if(readResult.IsSuccess){
                     short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
                     short staNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 2);
@@ -453,79 +235,8 @@
             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(2, 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 write5(StaProtocol staProtocol) throws InterruptedException {
-        if (null == staProtocol) {
-            return;
-        }
-
-        OperateResult writeResult;
-        //浠诲姟涓嬪彂娆℃暟
-        int writeCount = 0;
-        //浠诲姟涓嬪彂鎴愬姛鏍囪瘑
-        boolean writeFlag = false;
-        while(writeCount < 5){
-            writeResult = siemensS7Net.Write("DB100.310", staProtocol.getRollback102().shortValue());
-            if(writeResult.IsSuccess){
-                Thread.sleep(200);
-                OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.310", (short)2);
-                if(readResult.IsSuccess){
-                    short rollback = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-                    if (staProtocol.getRollback102() == (int) rollback) {
-                        //浠诲姟鍛戒护鍐欏叆鎴愬姛
-                        writeFlag = true;
-                        log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-                        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(5, staProtocol));
+//            //閲嶆柊娣诲姞鏁版嵁鍒颁换鍔¢槦鍒�
+//            boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(2, staProtocol));
             read();//璇诲彇1娆¤澶囩姸鎬�
             return;
         } else {
@@ -564,22 +275,6 @@
         if (null != staProtocol) {
             staProtocol.setPakMk(pakMk);
         }
-    }
-
-    /**
-     * 鍏呯數鎺у埗
-     * @param index 鍏呯數妗╁簭鍙� 0 寮�濮�
-     * @param open true 寮�濮嬪厖鐢碉紱false 缁撴潫鍏呯數
-     */
-    public boolean charge(int index, boolean open) {
-        OperateResult write = siemensS7Net.Write("DB102.50." + (index + 3), open);
-        if (!write.IsSuccess) {
-            News.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗澶辫触", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
-            return false;
-        } else {
-            News.error("杈撻�佺嚎plc缂栧彿={} {}鍙峰厖鐢垫々{}鎺у埗鎴愬姛", slave.getId(), index + 1, open?"鎵撳紑":"鍏抽棴");
-        }
-        return true;
     }
 
     @Override

--
Gitblit v1.9.1