From 09fcc4ec56a1ce6c0fcb308348d8dd5e2c08d336 Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期四, 22 五月 2025 14:33:06 +0800
Subject: [PATCH] server commit files

---
 src/main/java/com/zy/core/thread/impl/FyDevpThread.java |   68 +++++++++++++++++++++++++++++++---
 1 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index c379f03..c13f926 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -99,6 +99,10 @@
                         write((StaProtocol) task.getData());
                         read();
                         break;
+                    // 鎶ヨ
+                    case 3:
+                        writeError((Integer) task.getData());
+                        break;
                     default:
                         break;
                 }
@@ -162,8 +166,9 @@
                 staProtocol.setInEnable(status[3]); // 鍙叆
                 staProtocol.setOutEnable(status[4]);// 鍙嚭
 
+
                 staProtocol.setBackErr(status[5]);
-                staProtocol.setHigh(status[6]);
+                staProtocol.setLeftErr(status[6]);
                 staProtocol.setRightErr(status[7]);
 //                staProtocol.setHighErr(status[8]);
 //                staProtocol.setWeightErr(status[9]);
@@ -175,6 +180,7 @@
                 staProtocol.setWeightErr(status2[1]);
                 staProtocol.setLow(status2[2]);
                 staProtocol.setHigh(status2[3]);
+                staProtocol.setBarcodeErr(status2[4]);
 //                staProtocol.setInEnable(status[13]); // 鍙叆
 //                staProtocol.setOutEnable(status[14]);// 鍙嚭
 
@@ -204,11 +210,7 @@
                     BasDevp sqlModel = staProtocol.toSqlModel();
                     stations.add(sqlModel);
 
-                    //鏆傛椂鍐欏叆鏁版嵁搴�
-                    BasDevp basDevp = basConveyorStaService.selectById(sta);
-                    if (basDevp == null) {
-                        basConveyorStaService.insert(sqlModel);
-                    }
+
                 }
                 if (!stations.isEmpty()) {
                     if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
@@ -254,6 +256,60 @@
     }
 
     /**
+     * 鎶ヨ
+     */
+    private void writeError(Integer staNo) throws InterruptedException {
+        if (null == staNo) {
+            return;
+        }
+
+        ArrayList<Integer> lift1 = new ArrayList<Integer>() {{
+            add(1011);
+            add(1012);
+        }};
+
+        ArrayList<Integer> lift2 = new ArrayList<Integer>() {{
+            add(1021);
+            add(1022);
+            add(1023);
+        }};
+
+        ArrayList<Integer> devp1 = new ArrayList<Integer>() {{
+            add(1013);
+            add(1014);
+            add(1015);
+        }};
+
+        ArrayList<Integer> devp2 = new ArrayList<Integer>() {{
+            add(1024);
+            add(1025);
+            add(1026);
+        }};
+
+        String dbAddress = "DB82.48";
+        if (lift1.contains(staNo)) {
+            dbAddress = "DB82.48";
+        } else if (lift2.contains(staNo)) {
+            dbAddress = "DB82.178";
+        } else if (devp1.contains(staNo)) {
+            dbAddress = "DB82.100";
+        } else if (devp2.contains(staNo)) {
+            dbAddress = "DB82.256";
+        }else {
+            return;
+        }
+
+        OperateResult write1 = siemensS7Net.Write(dbAddress, (short) 1);
+        if (!write1.IsSuccess) {
+            OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鎶ヨ鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(true)));
+            log.error("鍐欏叆杈撻�佺嚎绔欑偣鎶ヨ鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(true));
+            return;
+        }
+        OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鎶ヨ鏁版嵁鎴愬姛銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(true)));
+        log.info("鍐欏叆杈撻�佺嚎绔欑偣鎶ヨ鏁版嵁鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(true));
+    }
+
+    /**
      * 蹇冭烦
      */
     private void heartbeat() {

--
Gitblit v1.9.1