From 8e1267325e9ac43e80b6febee086a8f66bb5417f Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 25 三月 2025 12:57:59 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/controller/SiteController.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 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 e0aba4d..6b951f4 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,29 @@ @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> 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> map4 = new HashMap<>(); + map4.put("floor", 4); + map4.put("modeVal", devpThread.ioModeOf4F.id); + map4.put("modeDesc", devpThread.ioModeOf4F.desc); + res.add(map4); + } + } + return R.ok().add(res); + } + @PostMapping("/table/site") @ManagerAuth(memo = "绔欑偣淇℃伅琛�") public R siteTable(){ -- Gitblit v1.9.1