From c9b14e19a87cbd27e7e8b56bf35726e3760fded4 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期日, 21 五月 2023 15:00:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  115 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 25d9512..7065f1b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,6 +8,7 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.service.BasDevpService;
 import com.zy.core.DevpThread;
@@ -42,19 +43,34 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);
-        add(201);add(202);add(203);add(204);
-        add(301);add(302);add(303);add(304);add(305);add(306);
+        add(100);add(101);add(102);add(103);add(104);add(105);
     }};
-
     /**
      * 鏉$爜鏁伴噺
      */
-    private int barcodeSize = 3;
-    public IoModeType ioMode = IoModeType.NONE;
+    private int barcodeSize = 2;
+
+    /**
+     * 鍏ュ嚭搴撴ā寮�
+     * 0锛氭湭鐭�
+     * 1锛氬叆搴撳惎鍔ㄤ腑
+     * 2.鍏ュ簱妯″紡
+     * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
+     * 4.鍑哄簱妯″紡
+     */
+    public IoModeType ioModeOf1F1 = IoModeType.NONE;
+    public IoModeType ioModeOf1F2 = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
+    }
+    private ArrayList<Integer> getStaNo() {
+        switch (slave.getId()) {
+            case 1:
+                return staNos;
+            default:
+                throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
+        }
     }
 
     @Override
@@ -113,8 +129,9 @@
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
     private void read() throws InterruptedException {
-//        // 鏇存柊鍏ュ嚭搴撴ā寮�
-//        updateIoMode();
+        // 鏇存柊鍏ュ嚭搴撴ā寮�
+        updateIoMode();
+        ArrayList<Integer> staNos = getStaNo();
         int staNoSize = staNos.size();
         OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
         if (result.IsSuccess) {
@@ -128,13 +145,13 @@
                 }
                 staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
 
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2 ));   // 鐩爣绔�
             }
         }
-//        Thread.sleep(200);
-//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
+        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
 //        if (result0.IsSuccess) {
-//            for (int i = 0; i < 93; i++) {
+//            for (int i = 0; i < staNoSize; i++) {
 //                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
 //                StaProtocol staProtocol = station.get(siteId);
 //                if (null == staProtocol) {
@@ -145,12 +162,13 @@
 //                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
 //            }
 //        }
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.100", (short) (staNoSize));
+//        Thread.sleep(200);
+        OperateResultExOne<byte[]> result1 = null;
+        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, 1);
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 2);
                 StaProtocol staProtocol = station.get(siteId);
                 staProtocol.setAutoing(status[0]);  // 鑷姩
                 staProtocol.setLoading(status[1]);  // 鏈夌墿
@@ -158,8 +176,10 @@
                 staProtocol.setOutEnable(status[3]);// 鍙嚭
                 staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
                 staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
-                staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-                staProtocol.setLow(status[7]);      // 浣庡簱浣�
+                staProtocol.setLow(status[6]);   // 浣� -- 楂�
+                staProtocol.setLow1(status[7]);
+                staProtocol.setHigh(status[8]);
+                staProtocol.setHigh1(status[9]);
 
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
@@ -167,25 +187,39 @@
             }
         }
 
-        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");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
-                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
-                    barcodeThread.setBarcode(barcode);
+//        鏉$爜鎵弿鍣�
+        if(slave.getId() == 1) {
+            Thread.sleep(200);
+            OperateResultExOne<byte[]> result2 = null;
+            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");
+                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                        barcodeThread.setBarcode(barcode);
+                    }
                 }
             }
-
         }
 
-//        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
-//        if (result2.IsSuccess) {
-//            this.ioMode = IoModeType.get(result2.Content);
+//        //RGV灏忚溅
+//        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
+//        if (result3.IsSuccess) {
+//            Integer siteId = 16;
+//            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, 0)));
 //        }
 
-        if (result.IsSuccess && result1.IsSuccess) {
+
+
+        if (result.IsSuccess && !Cools.isEmpty(result1) && result1.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -220,15 +254,16 @@
         if (null == staProtocol) {
             return;
         }
+        ArrayList<Integer> staNos = getStaNo();
         int index = staNos.indexOf(staProtocol.getSiteId());
-        short[] array = new short[10];
+        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());    // 鐩爣绔�
+//        Thread.sleep(300);
+//        OperateResult write1 = siemensS7Net.Write("DB100." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
 
         if (!write.IsSuccess) {
             staProtocol = station.get(staProtocol.getSiteId());
@@ -245,10 +280,16 @@
 
     // 鏇存柊鍏ュ嚭搴撴ā寮�
     private void updateIoMode() throws InterruptedException {
-        if (this.ioMode != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB200", this.ioMode.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                log.error("鍐欏叆杈撻�佺嚎1F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+        if (slave.getId() == 1 && this.ioModeOf1F1 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.120", this.ioModeOf1F1.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎1F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+            }
+        }
+        if (slave.getId() == 1 && this.ioModeOf1F2 != IoModeType.NONE) {
+            if (!siemensS7Net.Write("DB100.122", this.ioModeOf1F2.id).IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+                log.error("鍐欏叆杈撻�佺嚎1F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
             }
         }
     }

--
Gitblit v1.9.1