From 8f0bc9c0e67c527bef6392401b776d36423206f4 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 17 二月 2023 10:55:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 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 10dc000..72cadd1 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -15,7 +15,8 @@
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.DevpThread;
+import com.zy.core.DevpThread;
+import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,6 +37,68 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+
+ @GetMapping("/io/mode/info/site")
+ @ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
+ public R ioMode(){
+ 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);
+ 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);
+ } else {
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("floor", 3);
+ 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);
+ }
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
@@ -63,6 +126,8 @@
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 ? "楂�" : "浣�");
}
return R.ok().add(list);
}
@@ -137,6 +202,7 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 闇�姹�1
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅
return R.ok().add(vo);
}
}
@@ -156,6 +222,11 @@
for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
if (siteId.equals(entry.getKey())) {
StaProtocol staProtocol = entry.getValue();
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
if (workNo != null) {
staProtocol.setWorkNo(workNo);
}
--
Gitblit v1.9.1