From 6ed70263efe02a6b302d938f5c1502c2fc4a9e28 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 29 一月 2023 16:01:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 6b951f4..165174a 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -45,12 +45,24 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
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> 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> 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);
--
Gitblit v1.9.1