From bfdefee9b5c28c431891ebf4686d0fdeed6c4665 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 26 十二月 2023 08:09:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 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 9d5b523..281e3cf 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -3,16 +3,16 @@
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.BasLiftOptMapper;
+import com.zy.asrs.mapper.BasShuttleOptMapper;
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.ShuttleProtocolStatusType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.LedSlave;
import com.zy.core.model.LiftSlave;
@@ -48,6 +48,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasLiftOptMapper basLiftOptMapper;
+ @Autowired
+ private BasShuttleOptMapper basShuttleOptMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -316,10 +320,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", "鍥涘悜杞�");//寮傚父淇℃伅
@@ -367,7 +378,20 @@
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