From 7ba042f4fb701de6916594962116a49b05491178 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 22 十二月 2023 22:05:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs --- src/main/java/com/zy/asrs/controller/SiteController.java | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 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..d3dab66 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.*; @@ -36,6 +37,27 @@ 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()); + 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); + } + return R.ok().add(res); + } @PostMapping("/table/site") @ManagerAuth(memo = "绔欑偣淇℃伅琛�") @@ -63,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