From 862d30aef09932ebb73a33c153ccf80a4901e54a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 十二月 2023 13:51:28 +0800
Subject: [PATCH] #小车异常通知
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 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..d9ebc7a 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -3,19 +3,26 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SpringUtils;
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.entity.BasShuttleErr;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.BasShuttleErrService;
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.ShuttleSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.NyShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
+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;
@@ -294,7 +301,29 @@
return R.ok().add(errorMsg);
}
+ /**
+ * 灏忚溅寮傚父閫氱煡
+ */
+ @GetMapping("/shuttle/error")
+ public R monitorShuttleError() {
+ 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("shuttleNo", shuttleProtocol.getShuttleNo());//灏忚溅鍙�
+ map.put("errorMsg", shuttleProtocol.getErrCode$());//寮傚父淇℃伅
+ list.add(map);
+ }
+ }
+ return R.ok().add(list);
+ }
--
Gitblit v1.9.1