From 7a6426b60312f5f26762cf727152ec04155956cd Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 12 十二月 2022 13:50:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 24 ++++++-----
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 42 ++++++++++++--------
2 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index fffc591..6b951f4 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -44,17 +44,19 @@
List<Map<String, Object>> res = new ArrayList<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- Map<String, Object> map2 = new HashMap<>();
- map2.put("floor", 2);
- map2.put("modeVal", devpThread.ioModeOf2F.id);
- map2.put("modeDesc", devpThread.ioModeOf2F.desc);
- res.add(map2);
-
- Map<String, Object> map4 = new HashMap<>();
- map4.put("floor", 4);
- map4.put("modeVal", devpThread.ioModeOf4F.id);
- map4.put("modeDesc", devpThread.ioModeOf4F.desc);
- res.add(map4);
+ if (devp.getId() == 1) {
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("floor", 2);
+ map2.put("modeVal", devpThread.ioModeOf2F.id);
+ map2.put("modeDesc", devpThread.ioModeOf2F.desc);
+ res.add(map2);
+ } else {
+ Map<String, Object> map4 = new HashMap<>();
+ map4.put("floor", 4);
+ map4.put("modeVal", devpThread.ioModeOf4F.id);
+ map4.put("modeDesc", devpThread.ioModeOf4F.desc);
+ res.add(map4);
+ }
}
return R.ok().add(res);
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 955f1b5..85c82c1 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -53,6 +53,8 @@
add(401);add(402);
}};
+ private Integer count=0;
+
/**
* 鏉＄爜鏁伴噺
*/
@@ -123,26 +125,30 @@
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
private void initSite() {
+ count ++;
ArrayList<Integer> staNos = getStaNo();
- // 绔欑偣缂栧彿
- for (Integer siteId : staNos) {
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo((short) 0); // ID
- staProtocol.setAutoing(false); // 鑷姩
- staProtocol.setLoading(false); // 鏈夌墿
- staProtocol.setInEnable(false); // 鍙叆
- staProtocol.setOutEnable(false); // 鍙嚭
- staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
- staProtocol.setStaNo((short) 0); // 鐩爣绔�
+ if(count > 10) {
+ // 绔欑偣缂栧彿
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo((short) 0); // ID
+ staProtocol.setAutoing(false); // 鑷姩
+ staProtocol.setLoading(false); // 鏈夌墿
+ staProtocol.setInEnable(false); // 鍙叆
+ staProtocol.setOutEnable(false); // 鍙嚭
+ staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
+ staProtocol.setStaNo((short) 0); // 鐩爣绔�
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
}
+ count = 0;
}
}
@@ -224,6 +230,7 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
+ count = 0;
}
}
} else if(slave.getId()==2) {
@@ -246,6 +253,7 @@
staProtocol.setPakMk(true);
}
}
+ count = 0;
}
}
--
Gitblit v1.9.1