From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs
---
src/main/java/com/zy/asrs/controller/SiteController.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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..165174a 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -44,17 +44,31 @@
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);
+ if (devp.getId() == 1) {
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("floor", 1);
+ map1.put("modeVal", devpThread.ioModeOf1F.id);
+ map1.put("modeDesc", devpThread.ioModeOf1F.desc);
+ res.add(map1);
- 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);
+ 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> map3 = new HashMap<>();
+ map3.put("floor", 3);
+ map3.put("modeVal", devpThread.ioModeOf3F.id);
+ map3.put("modeDesc", devpThread.ioModeOf3F.desc);
+ res.add(map3);
+
+ 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);
}
--
Gitblit v1.9.1