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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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..e5425d1 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -3,13 +3,12 @@
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;
@@ -48,6 +47,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasLiftOptMapper basLiftOptMapper;
+ @Autowired
+ private BasShuttleOptMapper basShuttleOptMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -367,7 +370,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