From 9f687cf8a3218cf7dcda92d641703c46ae2c93c6 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 08 六月 2022 17:43:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  136 +++++++++++++++++----------------------------
 1 files changed, 52 insertions(+), 84 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 9c10f69..6fa259a 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,21 +5,28 @@
 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.google.common.base.Utf8;
+import com.sun.xml.internal.bind.v2.runtime.output.Encoded;
 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.Slave;
 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;
 import com.zy.core.model.Task;
 import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.properties.SlaveProperties;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -41,23 +48,16 @@
     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(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(130);add(131);add(132);add(133);add(134);add(135);add(136);
     }};
-
-    public IoModeType ioMode = IoModeType.NONE;
     /**
-     * 182绔欏爢鍨涙満鎵ц涓嚭搴撴暟閲�
+     * 鏉$爜鏁伴噺
      */
-    public int PRE_COUNT=0;
+    private int barcodeSize = 1;
+    public IoModeType ioMode = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
@@ -121,9 +121,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) {
@@ -131,27 +132,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("DB150.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);
@@ -171,37 +174,16 @@
         }
 
         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)(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);
                 }
-                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);     // 鍏ュ簱鏆傚瓨鏁�
             }
+
         }
 
 //        OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
@@ -209,7 +191,7 @@
 //            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()));
 
@@ -231,25 +213,6 @@
                 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);
-                    if(count != PRE_COUNT){
-                        OperateResult write = siemensS7Net.Write("DB300.2",(short)count);
-                        if (write.IsSuccess) {
-                            PRE_COUNT = count;
-                        } else {
-                            log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忛敊璇�,浠诲姟鏁伴噺==>>" + count);
-                        }
-                    }
-                }
-            }catch (Exception e) {
-                e.printStackTrace();
-                log.error("鏇存柊鍫嗗灈鏈哄嚭搴撳埌182绔欎换鍔℃暟閲忓け璐�");
-            }
-
         } 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());
@@ -264,11 +227,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[10];
+        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