From bc4c8388086c61d6515ea58d932a0a72a958ade9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 二月 2023 15:15:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensDevpThread.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 63a0566..636d9ab 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,9 +42,9 @@
     private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
     private short heartBeatVal = 1;
     public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
-        add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
-//        add(201);add(202);add(203);add(204);
-//        add(301);add(302);add(303);add(304);add(305);add(306);
+        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(101);
     }};
 
     /**
@@ -254,11 +254,6 @@
         } else {
             OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
             log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}",  slave.getId(), JSON.toJSON(staProtocol));
-            Integer siteId = staProtocol.getSiteId();
-            staProtocol = station.get(siteId);
-            if ( siteId == 102 && (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
-                staProtocol.setPakMk(true);
-            }
         }
     }
 

--
Gitblit v1.9.1