From 69dfa4959ce6541a6f176b45f2d5686d2dc9910f Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 30 十二月 2025 19:02:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |  305 +++++++++++++++++---------------------------------
 1 files changed, 103 insertions(+), 202 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 5869e51..d1bd0ab 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,12 +8,6 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
-import com.zy.entity.BasDevp;
-import com.zy.entity.BasRgvMap;
-import com.zy.service.BasDevpService;
-import com.zy.service.BasRgvMapService;
-import com.zy.utils.News;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
@@ -24,14 +18,14 @@
 import com.zy.core.model.Task;
 import com.zy.core.model.protocol.StaError1;
 import com.zy.core.model.protocol.StaProtocol;
+import com.zy.entity.BasDevp;
+import com.zy.service.BasDevpService;
+import com.zy.utils.News;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -47,43 +41,27 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
     private StaError1 staError1;
-//    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-//
-//    }};
-    public static final ArrayList<Integer> staNos1 = 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(1);
-//        add(200);add(201);add(202);
+
+
+
+    public static final ArrayList<Integer> staNos1= new ArrayList<Integer>() {{
+        add(1001);add(1002);add(1003);add(1004);add(1005);add(1006);add(1007);add(1008);add(1009);add(1010);
+        add(1011);add(1012);add(1013);add(1014);add(1015);add(1016);add(1017);add(1018);add(1019);
+        add(1020);add(1021);add(1022);add(1023);add(1024);add(1071);
+    }};
+    public static final ArrayList<Integer> staNos2= new ArrayList<Integer>() {{
+        add(1025);add(1026);add(1027);add(1028);add(1029);add(1030);add(1031);add(1032);add(1033);
+        add(1034);add(1035);add(1036);add(1037);add(1039);add(1040);add(1041);add(1042);add(1043);
+        add(1044);add(1045);add(1046);add(1047);add(1048);
     }};
 
-    public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
-        add(0); add(1); add(2);
-    }};
-    public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
-        add(106); add(107); add(159);
-    }};
 
-    private Integer count=0;
-
-    /**
-     * 鏉$爜鏁伴噺
-     */
-    private int barcodeSize = 6;
+    public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
+        add(1002); add(1004);add(1006); add(1008);
+    }};
+    public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
+        add(1041); add(1043);add(1045); add(1047);
+    }};
 
     /**
      * 鍏ュ嚭搴撴ā寮�
@@ -93,22 +71,27 @@
      * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
      * 4.鍑哄簱妯″紡
      */
-    public IoModeType ioModeOf2F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
-    public IoModeType ioModeOf4F = IoModeType.NONE;
-//    public IoModeType ioMode = IoModeType.NONE;
+    public IoModeType ioModeOf101 = IoModeType.NONE;
 
     public SiemensDevpThread(DevpSlave slave) {
         this.slave = slave;
     }
 
     private ArrayList<Integer> getStaNo() {
-        switch (slave.getId()) {
-            case 1:
-                return staNos1;
-            default:
-                throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+        if (slave.getId() == 1){
+            return staNos2;
+        }else {
+            return staNos1;
         }
+
+    }
+    private ArrayList<Integer> getBarcodeList() {
+        if (slave.getId() == 1){
+            return BarcodeList2;
+        }else {
+            return BarcodeList1;
+        }
+
     }
 
     @Override
@@ -130,7 +113,7 @@
                     // 鍐欐暟鎹� ID+鐩爣绔�
                     case 2:
                         write((StaProtocol)task.getData());
-                        log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
+//                        log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
                         break;
                     default:
                         break;
@@ -144,13 +127,12 @@
 
         }
     }
+
     /**
      * 鍒濆鍖栫珯鐐圭姸鎬�
      */
     private void initSite() {
-        count ++;
         ArrayList<Integer> staNos = getStaNo();
-        if(count > 77) {
             // 绔欑偣缂栧彿
             for (Integer siteId : staNos) {
                 StaProtocol staProtocol = station.get(siteId);
@@ -171,7 +153,23 @@
                     staProtocol.setPakMk(true);
                 }
             }
-            count = 0;
+        // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+        try {
+            List<BasDevp> basDevps = new ArrayList<>();
+            for (Integer siteId2 : staNos) {
+                StaProtocol staProtocol2 = station.get(siteId2);
+                basDevps.add(staProtocol2.toSqlModel());
+            }
+
+            BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+            if(basDevps.size() > 0) {
+                if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+                    throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+                }
+            }
+
+        } catch (Exception e){
+
         }
     }
 
@@ -198,14 +196,12 @@
     /**
      * 璇诲彇鐘舵�� ====> 鏁村潡plc
      */
-    private void read() throws InterruptedException {
-//        // 鏇存柊鍏ュ嚭搴撴ā寮�
-//        updateIoMode();
+    private void read() {
         ArrayList<Integer> staNos = getStaNo();
-        int staNoSize = staNos.size();
-        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*8));
+        // 绔欑偣淇℃伅
+        OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNos.size()*8));
         if (result.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
+            for (int i = 0; i < staNos.size(); i++) {
                 Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
                 StaProtocol staProtocol = station.get(siteId);
                 if (null == staProtocol) {
@@ -225,105 +221,58 @@
                 staProtocol.setEmptyMk(status[4]);  // 绌烘澘淇″彿
                 staProtocol.setFullPlt(status[5]);  // 婊℃墭鐩�
                 staProtocol.setHigh(status[6]);     // 楂樺簱浣�
-                staProtocol.setLow(status[7]);      // 浣庡簱浣�
+                staProtocol.setLow(status[7]);      // 涓簱浣�
+                staProtocol.setCenter(status[8]);   // 浣庡簱浣�
 
                 if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
                     staProtocol.setPakMk(true);
                 }
             }
+        } else {
+            initSite();
+            OutputQueue.CRN.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("SiemensCrn"+" - 4"+" - 璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+            return;
         }
-        BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
-        //RGV灏忚溅1
-//        Thread.sleep(100);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB50.200",(short)10);
-        if (result3.IsSuccess) {
-            BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));
-            if (!Cools.isEmpty(basRgvMap)){
-                Integer siteId = 1;
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setAutoing(true);
-                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 8)));
-            }
-        }
-        //RGV灏忚溅2
-//        Thread.sleep(100);
-        OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB50.212",(short)10);
-        if (result4.IsSuccess) {
-            BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result4.Content, 0));
-            if (!Cools.isEmpty(basRgvMap)){
-                Integer siteId = 2;
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setAutoing(true);
-                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result4.Content, 8)));
-            }
-        }
-
-        //RGV灏忚溅3
-//        Thread.sleep(100);
-        OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB50.224",(short)10);
-        if (result5.IsSuccess) {
-            BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo((int) siemensS7Net.getByteTransform().TransInt16(result5.Content, 0));
-            if (!Cools.isEmpty(basRgvMap)){
-                Integer siteId = 3;
-                StaProtocol staProtocol = station.get(siteId);
-                if (null == staProtocol) {
-                    staProtocol = new StaProtocol();
-                    staProtocol.setSiteId(siteId);
-                    station.put(siteId, staProtocol);
-                }
-                staProtocol.setAutoing(true);
-                staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result5.Content, 8)));
-            }
-        }
-
-        //鏉$爜鎵弿鍣�
-        ArrayList<Integer> barcodeList = BarcodeList;
-        OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840", (short) (barcodeList.size() * 8));
-        if (result2.IsSuccess) {
+        ArrayList<Integer> barcodeList = getBarcodeList();
+        // 鏉$爜鎵弿鍣�
+        OperateResultExOne<byte[]> barcodeResult = siemensS7Net.Read("DB101.860", (short) (barcodeList.size() * 8));
+        if (barcodeResult.IsSuccess) {
             for (int i = 0; i < barcodeList.size(); i++) {
-                Integer barcodeId = barcodeList.get(i);
-                String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
-                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
+                String barcode = siemensS7Net.getByteTransform().TransString(barcodeResult.Content,i*8 ,8, "UTF-8");
+                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeList.get(i));
                 if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                     barcodeThread.setBarcode(barcode);
                 }
             }
         }
-        //澶栧舰妫�娴�
-        ArrayList<Integer> staNoErrs = staNosErrList;
-        int staNoErrsSize = staNoErrs.size();
-        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (staNoErrsSize*8));
+
+        // 澶栧舰妫�娴�
+        OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.800", (short) (barcodeList.size() *6)); // 涓嶈繛缁紝澶氳涓棿涓�涓�
         if (resultErr.IsSuccess){
-            for (int i = 0;i<3;i++){
-                Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
+            for (int i = 0;i<barcodeList.size();i++){
+                StaProtocol staProtocol = station.get(barcodeList.get(i));
+                short goodsHeight = siemensS7Net.getByteTransform().TransInt16(resultErr.Content, i * 4);
+                staProtocol.setGoodsHeight(goodsHeight);
                 boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i*4+2, 1);
-                StaProtocol staProtocol = station.get(siteId);
                 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.setGroupSupportErr(status[5]);
                 staProtocol.setBarcodeErr(status[6]);
+                staProtocol.setWeightErr(status[7]);
+
             }
         }
 
-        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB13.2", (short) (staNoSize*4));
+        // 鏁呴殰淇℃伅鍙嶉
+        OperateResultExOne<byte[]> resultErr2 = siemensS7Net.Read("DB101.442", (short) (staNos.size() * 4));
         if (resultErr2.IsSuccess) {
-            for (int i = 0; i < staNoSize; i++) {
-                Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4, 1);
-                StaProtocol staProtocol = station.get(siteId);
+            for (int i = 0; i < staNos.size(); i++) {
+                boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr2.Content, i*4 + 2, 1);
+                StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
                 staProtocol.setBreakerErr(status[0]);
                 staProtocol.setInfraredErr(status[1]);
                 staProtocol.setOutTimeErr(status[2]);
@@ -335,34 +284,6 @@
 
             }
         }
-        OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
-        if (resultErr3.IsSuccess) {
-            if (staError1 == null){
-                staError1 = new StaError1();
-            }
-            boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
-            staError1.setEMERGENCY_Stop_Core(status[0]);
-            staError1.setEMERGENCY_STOP1(status[1]);
-            staError1.setEMERGENCY_STOP2(status[2]);
-            staError1.setEMERGENCY_STOP3(status[3]);
-            staError1.setEMERGENCY_STOP4(status[4]);
-
-            staError1.setDoor_EMERGENCY_STOP1(status[5]);
-            staError1.setDoor_EMERGENCY_STOP2(status[6]);
-            staError1.setDoor_EMERGENCY_STOP3(status[7]);
-            staError1.setDoor_EMERGENCY_STOP4(status[8]);
-            staError1.setDoor_EMERGENCY_STOP5(status[9]);
-            staError1.setDoor_EMERGENCY_STOP6(status[10]);
-
-            staError1.setDoor_Open_Err1(status[11]);
-            staError1.setDoor_Open_Err1(status[12]);
-            staError1.setDoor_Open_Err1(status[13]);
-            staError1.setDoor_Open_Err1(status[14]);
-            staError1.setDoor_Open_Err1(status[15]);
-            staError1.setDoor_Open_Err1(status[16]);
-
-        }
-
 
         if (result.IsSuccess) {
 
@@ -401,21 +322,22 @@
             return;
         }
         ArrayList<Integer> staNos = getStaNo();
-        int index = staNos.indexOf(staProtocol.getSiteId());
-        OperateResult write = null;
-        OperateResult write1 = null;
+        int address = staNos.indexOf(staProtocol.getSiteId()) * 6;
+
+        OperateResult write;
+        OperateResult write1;
         //浠诲姟涓嬪彂娆℃暟
         int writeCount = 0;
         do {
-            write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            write = siemensS7Net.Write("DB100." + address, staProtocol.getWorkNo());    // 宸ヤ綔鍙�
+            write1 = siemensS7Net.Write("DB100." + (address + 2), staProtocol.getStaNo());    // 鐩爣绔�
             Thread.sleep(200);
-            write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue());    // 鐩爣绔�
             if(write.IsSuccess && write1.IsSuccess){
                 break;
             }
             else {
                 writeCount++;
-                log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+                News.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
             }
         }while (writeCount<5);
 
@@ -430,16 +352,7 @@
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
             News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
         }
-    }
-
-    // 鏇存柊鍏ュ嚭搴撴ā寮�
-    private void updateIoMode() throws InterruptedException {
-        if (this.ioModeOf2F != IoModeType.NONE) {
-            if (!siemensS7Net.Write("DB100.180", this.ioModeOf2F.id).IsSuccess) {
-                OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
-                News.error("SiemensDevp"+" - 6"+" - 鍐欏叆杈撻�佺嚎2F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
-            }
-        }
+        read();
     }
 
     /**
@@ -473,25 +386,13 @@
         siemensS7Net.ConnectClose();
     }
 
-    public static void main(String[] args) {
-        System.out.println(staNos1.indexOf(129));
-        System.out.println(staNos1.size());
-        for (int i = 0; i<staNos1.size(); i++) {
-//            System.out.println(i*2);
-//            System.out.println(i*2 + 200);
-//            System.out.println(i);
-        }
-        int index = staNos1.indexOf(128);
-        System.out.println(index*2);
-        System.out.println(index*2 + 200);
-    }
+    public static void main(String[] args) throws Exception {
+        DevpSlave slave = new DevpSlave();
+        slave.setIp("10.10.10.18");
+        SiemensDevpThread devpThread = new SiemensDevpThread(slave);
+        devpThread.connect();
 
-//    public static void main(String[] args) throws Exception {
-//        DevpSlave slave = new DevpSlave();
-//        slave.setIp("192.168.2.125");
-//        SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-//        devpThread.connect();
-//        devpThread.read();
+        devpThread.read();
 //        // 鍐�
 //        StaProtocol staProtocol = devpThread.getStation().get(1);
 //        staProtocol.setWorkNo((short) 232);
@@ -504,7 +405,7 @@
 //        // 璇�
 //        devpThread.read();
 //        System.out.println(JSON.toJSONString(devpThread.station));
-//
-//    }
+
+    }
 
 }

--
Gitblit v1.9.1