From 867505775ff2d205f335be55570a14ee9d15368d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 24 五月 2024 10:39:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6a5eb26..0dc3353 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
import com.zy.asrs.service.WrkMastService;
@@ -67,6 +68,8 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private DeviceErrorService deviceErrorService;
+ @Autowired
+ private BasCrnpService basCrnpService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -115,6 +118,28 @@
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆
+ vos.add(vo);
+ }
+ return R.ok().add(vos);
+ }
+
+
+ @PostMapping("/latest/data/hoist")
+ @ManagerAuth(memo = "鎻愬崌鏈哄疄鏃舵暟鎹�")
+ public R hoistLatestData(){
+ List<HoistDataVo> vos = new ArrayList<>();
+ Map<Integer, StaProtocol> stations = new HashMap<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (null != devpThread) {
+ stations.putAll(devpThread.getStation());
+ }
+ }
+ for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
+ HoistDataVo vo = new HoistDataVo();
+ StaProtocol staProtocol = entry.getValue();
+ vo.setHoistId(String.valueOf(entry.getKey()));
+ vo.setPlace(staProtocol.getPlace());
vos.add(vo);
}
return R.ok().add(vos);
@@ -310,6 +335,11 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
+ BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+ if (basCrnp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+
SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
@@ -334,6 +364,8 @@
vo.setError(""); // todo
}
}
+ vo.setInEnable(basCrnp.getInEnable());//鍙叆
+ vo.setOutEnable(basCrnp.getOutEnable());//鍙嚭
return R.ok().add(vo);
}
}
--
Gitblit v1.9.1