From fd5d26ae0d1dbf71f90b99ef84d09a34e2d10d83 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 一月 2025 10:45:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 117 ----------------------------------------------------------
1 files changed, 0 insertions(+), 117 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 8751548..1aa3d10 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -10,22 +10,12 @@
import com.zy.asrs.mapper.BasShuttleOptMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
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;
-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.LiftProtocol;
-import com.zy.core.model.protocol.NyShuttleProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
-import com.zy.core.thread.LiftThread;
-import com.zy.core.thread.NyShuttleThread;
-import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -92,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);
@@ -303,83 +263,6 @@
}
}
return R.ok().add(errorMsg);
- }
-
- /**
- * 璁惧寮傚父閫氱煡
- */
- @GetMapping("/device/error")
- public R monitorDeviceError() {
- 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;
- }
- HashMap<String, Object> map = new HashMap<>();
- if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
- if (System.currentTimeMillis() - shuttleProtocol.getLastOnlineTime() > 1000 * 60 * 5) {
- //绂荤嚎瓒呰繃浜斿垎閽�
- //璁惧绂荤嚎涓�
- map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
- map.put("errorMsg", "璁惧绂荤嚎");//寮傚父淇℃伅
- map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
- list.add(map);
- }
- }
-
- if (shuttleProtocol.getErrState() == 1) {
- //鏁呴殰涓�
- map.put("deviceNo", shuttleProtocol.getShuttleNo());//璁惧鍙�-灏忚溅鍙�
- map.put("errorMsg", shuttleProtocol.getErrCode$());//寮傚父淇℃伅
- map.put("device", "鍥涘悜杞�");//寮傚父淇℃伅
- list.add(map);
- }
- }
-
- for (LiftSlave slave : slaveProperties.getLift()) {
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, slave.getId());
- LiftProtocol liftProtocol = liftThread.getLiftProtocol();
- if (liftProtocol == null) {
- continue;
- }
-
- if (liftProtocol.getDeviceError()) {
- //鏁呴殰涓�
- StringBuffer buffer = new StringBuffer();
- if (liftProtocol.getFrontOverrun()) {
- buffer.append("鍓嶈秴闄�");
- }
- if (liftProtocol.getBackOverrun()) {
- buffer.append("鍚庤秴闄�");
- }
- if (liftProtocol.getLeftOverrun()) {
- buffer.append("宸﹁秴闄�");
- }
- if (liftProtocol.getRightOverrun()) {
- buffer.append("鍙宠秴闄�");
- }
- if (liftProtocol.getOverHeight()) {
- buffer.append("瓒呴珮");
- }
- if (liftProtocol.getOverWeight()) {
- 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());//寮傚父淇℃伅
- map.put("device", "鎻愬崌鏈�");//寮傚父淇℃伅
- list.add(map);
- }
- }
-
- return R.ok().add(list);
}
/**
--
Gitblit v1.9.1