From 48eebea1c82bd53f52e82d9f078da0c3f1f8e35f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 26 十二月 2023 14:39:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 46 +++-------------------------------------------
1 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index c7534f6..d3dab66 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -44,7 +44,6 @@
List<Map<String, Object>> res = new ArrayList<>();
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.ioModeOf1F1.id);
@@ -56,46 +55,6 @@
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> 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> 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> 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);
}
@@ -126,8 +85,9 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
-// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
- vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "灏�" : "澶�"); //楂樹綆搴撲綅
+ vo.setLocType1(devp.getLocType1$());
+// vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
--
Gitblit v1.9.1