From 3b64c807f60e5d6b71deca3f79c9be4be19abfaa Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 23 二月 2024 10:47:58 +0800
Subject: [PATCH] #显示器更新
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index e5425d1..45b88d9 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -12,6 +12,7 @@
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.ShuttleProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.LiftSlave;
@@ -26,10 +27,7 @@
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;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -319,10 +317,17 @@
if (shuttleProtocol == null) {
continue;
}
+ HashMap<String, Object> map = new HashMap<>();
+ if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
+ //璁惧绂荤嚎涓�
+ map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
+ map.put("errorMsg", "璁惧绂荤嚎");//寮傚父淇℃伅
+ map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
+ list.add(map);
+ }
if (shuttleProtocol.getErrState() == 1) {
//鏁呴殰涓�
- HashMap<String, Object> map = new HashMap<>();
map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
map.put("errorMsg", shuttleProtocol.getErrCode$());//寮傚父淇℃伅
map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
@@ -359,6 +364,10 @@
buffer.append("瓒呴噸");
}
+ if (liftProtocol.getErrorCode() > 0) {
+ buffer.append(liftProtocol.getErrCode$());
+ }
+
HashMap<String, Object> map = new HashMap<>();
map.put("deviceNo", liftProtocol.getLiftNo());//璁惧鍙�-鎻愬崌鏈哄彿
map.put("errorMsg", buffer.toString());//寮傚父淇℃伅
@@ -385,6 +394,29 @@
return R.ok().add(map);
}
+ /**
+ * 鑾峰彇璁惧杩愯寮傚父缁熻
+ */
+ @GetMapping("/deviceRunErrorStatistic/{type}")
+ public R deviceRunErrorStatistic(@PathVariable("type") String type) {
+ int time = 1;//榛樿1澶�
+ if (type.equals("day")) {
+ time = 1;
+ } else if (type.equals("week")) {
+ time = 7;
+ } else if (type.equals("month")) {
+ time = 30;
+ }
+ //鑾峰彇鎻愬崌鏈鸿繍琛屽紓甯告暟鎹�
+ List<Map<String, Object>> liftList = basLiftOptMapper.selectRunErrorStatistic(time);
+ //鑾峰彇灏忚溅杩愯寮傚父鏁版嵁
+ List<Map<String, Object>> shuttleList = basShuttleOptMapper.selectRunErrorStatistic(time);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("lift", liftList);
+ map.put("shuttle", shuttleList);
+ return R.ok().add(map);
+ }
+
--
Gitblit v1.9.1