From a14d14287e3502a46e2894770b5d2d9df6dd8e1f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 九月 2022 14:35:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 9f78842..122b07c 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -16,6 +16,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
+import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,6 +38,42 @@
@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());
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("floor", 1);
+ map1.put("modeVal", devpThread.charge0);
+ map1.put("modeDesc", devpThread.charge0?"鍏呯數涓�":"鍏抽棴");
+ res.add(map1);
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("floor", 2);
+ map2.put("modeVal", devpThread.charge1);
+ map2.put("modeDesc", devpThread.charge1?"鍏呯數涓�":"鍏抽棴");
+ res.add(map2);
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("floor", 3);
+ map3.put("modeVal", devpThread.charge2);
+ map3.put("modeDesc", devpThread.charge2?"鍏呯數涓�":"鍏抽棴");
+ res.add(map3);
+ }
+ return R.ok().add(res);
+ }
+
+ @PostMapping("/io/mode/action/site")
+ @ManagerAuth(memo = "鍏呯數鎺у埗")
+ public R ioModeAction(@RequestParam("floor") Integer floor, @RequestParam("charge") Boolean charge){
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ boolean res = devpThread.charge(floor - 1, charge);
+ return res?R.ok():R.error();
+ }
+ return R.ok();
+ }
+
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
public R siteTable(){
--
Gitblit v1.9.1