From e1783e196a4ada918268b9f81bfb3a19641e0626 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:24:09 +0800
Subject: [PATCH] 提升机状态读取、提升机高度设定、提升机操作方案

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  302 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 234 insertions(+), 68 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 37cd20f..8b093b6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,13 +5,17 @@
 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.zy.asrs.entity.BasDevp;
 import com.zy.asrs.service.BasDevpService;
+import com.zy.common.utils.CommonUtils;
 import com.zy.core.DevpThread;
+import com.zy.core.News;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
 import com.zy.core.model.Task;
@@ -38,12 +42,16 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
+    private int barcodeSize = 1;
     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(109);add(110);add(111);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(128);
-        add(200);add(201);add(202);add(203);add(204);add(205);
-        add(300);add(301);add(302);add(303);add(304);add(305);add(306);
+        add(100);add(101);add(102);
+        add(103);add(104);add(105);
+        add(106);add(107);add(108);
     }};
+
+    public boolean charge0;
+    public boolean charge1;
+    public boolean charge2;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -69,6 +77,10 @@
                     case 2:
                         write((StaProtocol)task.getData());
                         break;
+                    // 鍑哄叆搴撴ā寮�
+                    case 3:
+                        write3((StaProtocol)task.getData());
+                        break;
                     default:
                         break;
                 }
@@ -92,10 +104,10 @@
         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());
+            News.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());
+            News.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }
         siemensS7Net.ConnectClose();
         return result;
@@ -105,9 +117,9 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 140);
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNos.size()*4));
         if (result.IsSuccess) {
-            for (int i = 0; i < 35; i++) {
+            for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
@@ -115,29 +127,14 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 宸ヤ綔鍙�
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2 + 70));   // 鐩爣绔�
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4+2));   // 鐩爣绔�
             }
         }
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB100.180", (short) 28);
-        if (result0.IsSuccess) {
-            for (int i = 0; i < 7; i++) {
-                Integer siteId = staNos.get(i + 35); // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));     // 宸ヤ綔鍙�
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2 + 14));   // 鐩爣绔�
-            }
-        }
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.140", (short) 35);
+        Thread.sleep(200);
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNos.size()));
         if (result1.IsSuccess) {
-            for (int i = 0; i < 35; i++) {
+            for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i, 1);
                 StaProtocol staProtocol = station.get(siteId);
@@ -155,30 +152,77 @@
                 }
             }
         }
-        Thread.sleep(50);
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.208", (short) 7);
-        if (result2.IsSuccess) {
-            for (int i = 0; i < 7; i++) {
-                Integer siteId = staNos.get(i + 35); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(result2.Content, i, 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(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);
                 }
             }
         }
 
-        if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess && result2.IsSuccess) {
+        // 鍏呯數淇″彿浣�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);
+        }
+//        // 澶栧舰妫�娴� - 201
+//        Thread.sleep(50);
+//        OperateResultExOne<byte[]> result201 = siemensS7Net.Read("DB102.112", (short)1);
+//        if (result201.IsSuccess) {
+//            boolean[] status = siemensS7Net.getByteTransform().TransBool(result201.Content, 0, 1);
+//            StaProtocol staProtocol = station.get(201);
+//            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]);
+//        }
+//        // 澶栧舰妫�娴� - 301
+//        Thread.sleep(50);
+//        OperateResultExOne<byte[]> result301 = siemensS7Net.Read("DB102.114", (short)1);
+//        if (result301.IsSuccess) {
+//            boolean[] status = siemensS7Net.getByteTransform().TransBool(result301.Content, 0, 1);
+//            StaProtocol staProtocol = station.get(301);
+//            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]);
+//        }
+
+
+        if (result.IsSuccess && result1.IsSuccess) {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
             // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -194,13 +238,74 @@
                 }
             } catch (Exception e) {
                 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());
+                News.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             }
 
         } 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());
+//            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;
+        }
+        Short outAndIn = staProtocol.getOutInModel();
+        Integer siteId = staProtocol.getSiteId();
+        Short run = 1;//姝h浆
+        if (outAndIn == 1) {//鍏ュ簱
+            run = 1;//姝h浆
+        } else {
+            run = 2;//鍙嶈浆
+        }
+        switch (siteId) {
+            case 102:
+                siemensS7Net.Write("DB100.300", run);
+                break;
+            case 105:
+                siemensS7Net.Write("DB100.302", run);
+                break;
+            case 106:
+                siemensS7Net.Write("DB100.304", run);
+                break;
+            case 107:
+                siemensS7Net.Write("DB100.306", run);
+                break;
+            case 108:
+                siemensS7Net.Write("DB100.308", run);
+                break;
+        }
+
     }
 
     /**
@@ -211,30 +316,74 @@
             return;
         }
         int index = staNos.indexOf(staProtocol.getSiteId());
-        OperateResult write;
-        OperateResult write1;
-        // 涓�鏈�
-        if (staProtocol.getSiteId() < 300) {
-            write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+        short[] array = new short[2];
+        array[0] = staProtocol.getWorkNo();
+        array[1] = staProtocol.getStaNo();
+//        OperateResult write = siemensS7Net.Write("DB100." + index*4, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+//        Thread.sleep(500);
+//        OperateResult write1 = siemensS7Net.Write("DB100." + (index*4+2), 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);
+                        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);
-            write1 = siemensS7Net.Write("DB100." + (index*2 + 70), staProtocol.getStaNo());    // 鐩爣绔�
-        // 浜屾湡
-        } else {
-            write = siemensS7Net.Write("DB100." + index*2 + 180, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-            Thread.sleep(200);
-            write1 = siemensS7Net.Write("DB100." + (index*2 + 14) + 180, staProtocol.getStaNo());    // 鐩爣绔�
         }
 
-        if (!write.IsSuccess || !write1.IsSuccess) {
+        //鍐欏懡浠ゅ皾璇曚簡5娆¤繕鏄け璐ヤ簡
+        if(!writeFlag){
             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));
+            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));
+            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);
+            }
         }
     }
 
@@ -249,7 +398,7 @@
         }
         OperateResult write = siemensS7Net.Write("DB100.50", heartBeatVal);
         if (!write.IsSuccess) {
-            log.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
+            News.error("杈撻�佺嚎plc缂栧彿={} 蹇冭烦澶辫触", slave.getId());
         }
     }
 
@@ -264,21 +413,38 @@
         }
     }
 
+    /**
+     * 鍏呯數鎺у埗
+     * @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
     public void close() {
         siemensS7Net.ConnectClose();
     }
 
     public static void main(String[] args) {
+//        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);
+//        int index = staNos.indexOf(128);
+//        System.out.println(index*2);
+//        System.out.println(index*2 + 200);
     }
 
 //    public static void main(String[] args) throws Exception {

--
Gitblit v1.9.1