From 52a3d2b51c7ca58abcb0e31783671af98d526aef Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 22 十二月 2023 12:17:23 +0800
Subject: [PATCH] #检料盘点工作档更新
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 87 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 51fdd09..e5425d1 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -6,16 +6,25 @@
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
+import com.zy.asrs.mapper.BasLiftOptMapper;
+import com.zy.asrs.mapper.BasShuttleOptMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
+import com.zy.core.model.LiftSlave;
+import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.LiftProtocol;
+import com.zy.core.model.protocol.NyShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
+import com.zy.core.thread.LiftThread;
+import com.zy.core.thread.NyShuttleThread;
+import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +47,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasLiftOptMapper basLiftOptMapper;
+ @Autowired
+ private BasShuttleOptMapper basShuttleOptMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -294,9 +307,83 @@
return R.ok().add(errorMsg);
}
+ /**
+ * 璁惧寮傚父閫氱煡
+ */
+ @GetMapping("/device/error")
+ public R monitorDeviceError() {
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+ NyShuttleThread shuttleThread = (NyShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ NyShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+ if (shuttleProtocol.getErrState() == 1) {
+ //鏁呴殰涓�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
+ map.put("errorMsg", shuttleProtocol.getErrCode$());//寮傚父淇℃伅
+ map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
+ list.add(map);
+ }
+ }
+ for (LiftSlave slave : slaveProperties.getLift()) {
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ continue;
+ }
+ if (liftProtocol.getDeviceError()) {
+ //鏁呴殰涓�
+ StringBuffer buffer = new StringBuffer();
+ if (liftProtocol.getFrontOverrun()) {
+ buffer.append("鍓嶈秴闄�");
+ }
+ if (liftProtocol.getBackOverrun()) {
+ buffer.append("鍚庤秴闄�");
+ }
+ if (liftProtocol.getLeftOverrun()) {
+ buffer.append("宸﹁秴闄�");
+ }
+ if (liftProtocol.getRightOverrun()) {
+ buffer.append("鍙宠秴闄�");
+ }
+ if (liftProtocol.getOverHeight()) {
+ buffer.append("瓒呴珮");
+ }
+ if (liftProtocol.getOverWeight()) {
+ buffer.append("瓒呴噸");
+ }
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("deviceNo", liftProtocol.getLiftNo());//璁惧鍙�-鎻愬崌鏈哄彿
+ map.put("errorMsg", buffer.toString());//寮傚父淇℃伅
+ map.put("device", "鎻愬崌鏈�");//寮傚父淇℃伅
+ list.add(map);
+ }
+ }
+
+ return R.ok().add(list);
+ }
+
+ /**
+ * 鑾峰彇璁惧姣忓ぉ杩愯缁熻
+ */
+ @GetMapping("/deviceRunStatistic")
+ public R deviceRunStatistic() {
+ //鑾峰彇鎻愬崌鏈鸿繍琛屾暟鎹�
+ List<Map<String, Object>> liftList = basLiftOptMapper.selectRunStatistic();
+ //鑾峰彇灏忚溅杩愯鏁版嵁
+ List<Map<String, Object>> shuttleList = basShuttleOptMapper.selectRunStatistic();
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("lift", liftList);
+ map.put("shuttle", shuttleList);
+ return R.ok().add(map);
+ }
--
Gitblit v1.9.1