From f9436bed29bf19eba74f53594e22d6ff2604778d Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 12 十二月 2022 16:08:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 85 ++++++++++++++++++++++--------------------
1 files changed, 45 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index e8fa308..c7534f6 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -44,53 +44,58 @@
List<Map<String, Object>> res = new ArrayList<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- Map<String, Object> map1 = new HashMap<>();
- map1.put("floor", 1);
- map1.put("modeVal", devpThread.ioModeOf1F1.id);
- map1.put("modeDesc", devpThread.ioModeOf1F1.desc);
- res.add(map1);
+ if (devp.getId() == 1) {
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("floor", 1);
+ map1.put("modeVal", devpThread.ioModeOf1F1.id);
+ map1.put("modeDesc", devpThread.ioModeOf1F1.desc);
+ res.add(map1);
- Map<String, Object> map2 = new HashMap<>();
- map2.put("floor", 2);
- map2.put("modeVal", devpThread.ioModeOf1F2.id);
- map2.put("modeDesc", devpThread.ioModeOf1F2.desc);
- res.add(map2);
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("floor", 2);
+ map2.put("modeVal", devpThread.ioModeOf1F2.id);
+ map2.put("modeDesc", devpThread.ioModeOf1F2.desc);
+ res.add(map2);
+ } else {
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("floor", 2);
+ map3.put("modeVal", devpThread.ioModeOf1F3.id);
+ map3.put("modeDesc", devpThread.ioModeOf1F3.desc);
+ res.add(map3);
- Map<String, Object> map3 = new HashMap<>();
- map3.put("floor", 2);
- map3.put("modeVal", devpThread.ioModeOf1F3.id);
- map3.put("modeDesc", devpThread.ioModeOf1F3.desc);
- res.add(map3);
+ Map<String, Object> map4 = new HashMap<>();
+ map4.put("floor", 4);
+ map4.put("modeVal", devpThread.ioModeOf1F4.id);
+ map4.put("modeDesc", devpThread.ioModeOf1F4.desc);
+ res.add(map4);
- Map<String, Object> map4 = new HashMap<>();
- map4.put("floor", 4);
- map4.put("modeVal", devpThread.ioModeOf1F4.id);
- map4.put("modeDesc", devpThread.ioModeOf1F4.desc);
- res.add(map4);
+ Map<String, Object> map5 = new HashMap<>();
+ map5.put("floor", 5);
+ map5.put("modeVal", devpThread.ioModeOf2F1.id);
+ map5.put("modeDesc", devpThread.ioModeOf2F1.desc);
+ res.add(map5);
- Map<String, Object> map5 = new HashMap<>();
- map5.put("floor", 5);
- map5.put("modeVal", devpThread.ioModeOf2F1.id);
- map5.put("modeDesc", devpThread.ioModeOf2F1.desc);
- res.add(map5);
+ Map<String, Object> map6 = new HashMap<>();
+ map6.put("floor", 6);
+ map6.put("modeVal", devpThread.ioModeOf2F2.id);
+ map6.put("modeDesc", devpThread.ioModeOf2F2.desc);
+ res.add(map6);
- Map<String, Object> map6 = new HashMap<>();
- map6.put("floor", 6);
- map6.put("modeVal", devpThread.ioModeOf2F2.id);
- map6.put("modeDesc", devpThread.ioModeOf2F2.desc);
- res.add(map6);
+ Map<String, Object> map7 = new HashMap<>();
+ map7.put("floor", 7);
+ map7.put("modeVal", devpThread.ioModeOf3F1.id);
+ map7.put("modeDesc", devpThread.ioModeOf3F1.desc);
+ res.add(map7);
- Map<String, Object> map7 = new HashMap<>();
- map7.put("floor", 7);
- map7.put("modeVal", devpThread.ioModeOf3F1.id);
- map7.put("modeDesc", devpThread.ioModeOf3F1.desc);
- res.add(map7);
+ Map<String, Object> map8 = new HashMap<>();
+ map8.put("floor", 8);
+ map8.put("modeVal", devpThread.ioModeOf3F2.id);
+ map8.put("modeDesc", devpThread.ioModeOf3F2.desc);
+ res.add(map8);
+ }
- Map<String, Object> map8 = new HashMap<>();
- map8.put("floor", 8);
- map8.put("modeVal", devpThread.ioModeOf3F2.id);
- map8.put("modeDesc", devpThread.ioModeOf3F2.desc);
- res.add(map8);
+
+
}
return R.ok().add(res);
}
--
Gitblit v1.9.1