From dea324847d747e4a730902ddcaa56b87e623ef9a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 09 五月 2023 12:56:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/DevpSlave.java          |    4 ----
 src/main/webapp/views/pipeline.html                     |    2 +-
 src/main/webapp/static/js/common.js                     |    2 +-
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   14 +++++++-------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/model/DevpSlave.java b/src/main/java/com/zy/core/model/DevpSlave.java
index 923ef10..e327301 100644
--- a/src/main/java/com/zy/core/model/DevpSlave.java
+++ b/src/main/java/com/zy/core/model/DevpSlave.java
@@ -34,10 +34,6 @@
 
         private Integer barcode;
 
-        private Integer barcode1;
-
-        private Integer barcode2;
-
         private Integer backSta;
 
         private Integer led;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 83ced6c..13d5bae 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,7 +42,7 @@
     private SiemensS7Net siemensS7Net;
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
-    public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
+    public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
         add(100);add(101);add(102);add(103);add(104);add(105);
     }};
     /**
@@ -67,7 +67,7 @@
     private ArrayList<Integer> getStaNo() {
         switch (slave.getId()) {
             case 1:
-                return staNos1;
+                return staNos;
             default:
                 throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
         }
@@ -145,7 +145,7 @@
                 }
                 staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));     // 宸ヤ綔鍙�
 
-//                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2));   // 鐩爣绔�
+                staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2 ));   // 鐩爣绔�
             }
         }
         Thread.sleep(200);
@@ -326,14 +326,14 @@
     }
 
     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(staNos.indexOf(129));
+        System.out.println(staNos.size());
+        for (int i = 0; i<staNos.size(); i++) {
 //            System.out.println(i*2);
 //            System.out.println(i*2 + 200);
 //            System.out.println(i);
         }
-        int index = staNos1.indexOf(128);
+        int index = staNos.indexOf(128);
         System.out.println(index*2);
         System.out.println(index*2 + 200);
     }
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e0fb004..a19120b 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jfwcs";
+var baseUrl = "/kdywcs";
 
 // 璧嬪��
 function setVal(el, val) {
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 3702446..e744987 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -116,7 +116,7 @@
                         <th>鍏ュ簱鏍囪</th>
                         <th>绌烘澘淇″彿</th>
                         <th>鐩爣绔�</th>
-                        <th>澶у皬搴撲綅</th>
+                        <th>楂樹綆搴撲綅</th>
                     </tr>
                     </thead>
                     <!-- 琛ㄦ牸鍐呭 -->

--
Gitblit v1.9.1