From 7d5cf89b2a717598dbd02b1f33d3749b0c585be2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 31 五月 2023 15:35:26 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  176 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 100 insertions(+), 76 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 460cfd6..21d278d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,14 +5,15 @@
 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.asrs.service.WrkMastService;
 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.IoModeType;
 import com.zy.core.enums.SlaveType;
 import com.zy.core.model.DevpSlave;
@@ -41,20 +42,19 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 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(129);
-        add(130);add(131);add(132);add(133);add(134);add(135);add(136);add(137);add(138);add(139);
-        add(140);add(141);add(142);add(143);add(144);add(145);add(146);add(147);add(148);add(149);
-        add(150);add(151);add(152);add(153);add(154);add(155);add(156);add(157);add(158);add(159);
-        add(160);add(161);add(162);add(163);add(164);add(165);add(166);add(167);add(168);add(169);
-        add(170);add(171);add(172);add(173);add(174);add(175);add(176);add(177);add(178);add(179);
-        add(180);add(181);add(182);
-        add(183);add(184);add(185);add(186);add(187);add(188);add(189);
-        add(190);add(191);add(192);
+        add(101);add(102);add(103);add(104);
+        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(105);
     }};
 
+    /**
+     * 鏉$爜鏁伴噺
+     */
+    private int barcodeSize = 2;
     public IoModeType ioMode = IoModeType.NONE;
+
+    public int[][] startSignal = new int[48][2];
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -79,6 +79,20 @@
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
                         write((StaProtocol)task.getData());
+                        break;
+                    // 鍐欐暟鎹� 103绔欑偣鍐欏叆PACK鐮�
+                    case 4:
+                        write103((String)task.getData());
+                        break;
+                    // 鍐欐暟鎹� 103绔欑偣鍐欏叆PACK鐮�
+                    case 5:
+                        StaProtocol staProtocol2 = (StaProtocol)task.getData();
+                        siemensS7Net.Write("DB102.0" + staProtocol2.getSiteId(), staProtocol2.getStaNo()==1);
+                        break;
+                    //澶嶄綅娴嬭瘯淇″彿
+                    case 3:
+                        StaProtocol staProtocol = (StaProtocol)task.getData();
+                        siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
                         break;
                     default:
                         break;
@@ -118,9 +132,10 @@
     private void read() throws InterruptedException {
 //        // 鏇存柊鍏ュ嚭搴撴ā寮�
 //        updateIoMode();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 186);
+        int staNoSize = staNos.size();
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
         if (result.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) {
@@ -128,27 +143,29 @@
                     staProtocol.setSiteId(siteId);
                     station.put(siteId, staProtocol);
                 }
-                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 宸ヤ綔鍙�
+                staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4));     // 宸ヤ綔鍙�
+
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2));   // 鐩爣绔�
             }
         }
+//        Thread.sleep(200);
+//        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
+//        if (result0.IsSuccess) {
+//            for (int i = 0; i < 93; i++) {
+//                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+//                StaProtocol staProtocol = station.get(siteId);
+//                if (null == staProtocol) {
+//                    staProtocol = new StaProtocol();
+//                    staProtocol.setSiteId(siteId);
+//                    station.put(siteId, staProtocol);
+//                }
+//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
+//            }
+//        }
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-        if (result0.IsSuccess) {
-            for (int i = 0; i < 93; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2));   // 鐩爣绔�
-            }
-        }
-        Thread.sleep(200);
-        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 186);
+        OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
         if (result1.IsSuccess) {
-            for (int i = 0; i < 93; i++) {
+            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);
@@ -168,45 +185,40 @@
         }
 
         Thread.sleep(200);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB300.0", (short) 10);
-        if (result3.IsSuccess) {
-//            Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-            Integer siteId = 0;
-            for (int i = 0; i < 5; i++) {
-                switch (i){
-                    case 0:
-                        siteId = 100;
-                        break;
-                    case 1:
-                        siteId = 102;
-                        break;
-                    case 2:
-                        siteId = 104;
-                        break;
-                    case 3:
-                        siteId = 106;
-                        break;
-                    case 4:
-                        siteId = 108;
-                        break;
+        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(26));
+        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB100.216",(short)(6));
+        if (result2.IsSuccess) {
+                String barcode =siemensS7Net.getByteTransform().TransString(result2.Content,0,26, "UTF-8");
+//                String barcode=new String(result2.Content,i*12,12);
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
+                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                    barcodeThread.setBarcode(barcode);
                 }
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                short value = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
-                staProtocol.setInQty(value);     // 鍏ュ簱鏆傚瓨鏁�
+        }
+        if (result5.IsSuccess) {
+            String barcode =siemensS7Net.getByteTransform().TransString(result5.Content,0,6, "UTF-8");
+//                String barcode=new String(result2.Content,i*12,12);
+            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode,  2);
+            if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+                barcodeThread.setBarcode(barcode);
             }
         }
 
+        Thread.sleep(200);
+        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
+        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.0", (short) 96);
+        if(result3.IsSuccess) {
+            for(int i=0; i<48; i++){
+                startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
+                startSignal[i][1] = siemensS7Net.getByteTransform().TransInt16(result4.Content, i*2);
+            }
+        }
 //        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
 //        if (result2.IsSuccess) {
 //            this.ioMode = IoModeType.get(result2.Content);
 //        }
 
-        if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
+        if (result.IsSuccess && result1.IsSuccess) {
 
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -228,20 +240,27 @@
                 log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
             }
 
-            //鍑哄簱鍒�182绔欏爢鍨涙満浠诲姟鏁版嵁鍙戦�佺粰PLC
-            try{
-                WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
-                if(null != wrkMastService){
-                    int count = wrkMastService.getOutToStn182(182);
-                    OperateResult write = siemensS7Net.Write("DB200.2",(short)count);
-                }
-            }catch (Exception e) {
-                log.error("鏇存柊鏁版嵁搴撴暟鎹け璐�");
-            }
-
         } 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());
+        }
+    }
+
+    /**
+     * 鍐欏叆 pack鐮� =====> 鍗曠珯鐐瑰啓鍏�
+     */
+    private void write103(String packNo){
+        try{
+            OperateResult write = siemensS7Net.Write("DB100.", packNo);
+            if (!write.IsSuccess) {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(packNo)));
+                log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(packNo));
+            } else {
+                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(packNo)));
+                log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(packNo));
+            }
+        }catch (Exception e){
+            log.error("103绔欑偣鍐欏叆鏁版嵁澶辫触锛岃緭閫佺嚎绾跨▼write103");
         }
     }
 
@@ -253,11 +272,16 @@
             return;
         }
         int index = staNos.indexOf(staProtocol.getSiteId());
-        OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
-        Thread.sleep(500);
-        OperateResult write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo());    // 鐩爣绔�
+        short[] array = new short[2];
+        array[0] = staProtocol.getWorkNo();
+        array[1] = staProtocol.getStaNo();
+        OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
 
-        if (!write.IsSuccess || !write1.IsSuccess) {
+//        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);

--
Gitblit v1.9.1