From a6419abb1e5dc63f8957da5eb45c82d49b86cbc9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 一月 2025 16:38:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 104 ++++++++++++++++++++--------------------------------
1 files changed, 40 insertions(+), 64 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index d9ebc7a..1aa3d10 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -3,31 +3,21 @@
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.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;
-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.*;
@@ -45,6 +35,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasLiftOptMapper basLiftOptMapper;
+ @Autowired
+ private BasShuttleOptMapper basShuttleOptMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -88,36 +82,6 @@
Double yDistance = 0.0D;
Double xDuration = 0.0D;
Double yDuration = 0.0D;
-
- if (null != crnId) {
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
- if (crnThread != null) {
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol != null) {
- xSpeed = Double.valueOf(crnProtocol.getXSpeed());
- ySpeed = Double.valueOf(crnProtocol.getYSpeed());
- zSpeed = Double.valueOf(crnProtocol.getZSpeed());
- switch (crnProtocol.getForkPos()) {
- case 0:
- forkPos = 1;
- break;
- case 1:
- forkPos = 2;
- break;
- case 2:
- forkPos = 0;
- break;
- default:
- forkPos = 1;
- break;
- }
- xDistance = Double.valueOf(crnProtocol.getXDistance());
- yDistance = Double.valueOf(crnProtocol.getYDistance());
- xDuration = Double.valueOf(crnProtocol.getXDuration());
- yDuration = Double.valueOf(crnProtocol.getYDuration());
- }
- }
- }
// 鑾峰彇杈撻�佺嚎plc绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
@@ -302,30 +266,42 @@
}
/**
- * 灏忚溅寮傚父閫氱煡
+ * 鑾峰彇璁惧姣忓ぉ杩愯缁熻
*/
- @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);
+ @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);
}
-
+ /**
+ * 鑾峰彇璁惧杩愯寮傚父缁熻
+ */
+ @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