From 0cd19919fac8ef2ae1b86776cb72c61381799245 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 11 十月 2025 08:17:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 65 ++++++++++++--------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 0c0cff0..269b9bb 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -6,17 +6,21 @@
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.BasCrnError;
+import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.model.annotations.RateLimit;
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.CrnSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.LedThread;
+import com.zy.core.thread.SiemensCrnThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +43,8 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasCrnErrorMapper basCrnErrorMapper;
/**
* 鑾峰彇褰撳墠鏃堕棿
@@ -135,7 +141,7 @@
/**
* 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
*/
- @RateLimit(2)
+// @RateLimit(2)
@GetMapping("/pakin/rep")
public R monitorPakinRep(){
// 鍏ュ簱
@@ -200,7 +206,7 @@
/**
* 搴撲綅浣跨敤鎯呭喌缁熻
*/
- @RateLimit(60)
+// @RateLimit(60)
@GetMapping("/loc/rep")
public R monitorLocRep(){
List<Map<String, Object>> pie = new ArrayList<>();
@@ -283,46 +289,25 @@
return R.ok().add(errorMsg);
}
+ @GetMapping("/crn/error")
+ public R crnError() {
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (CrnSlave slave : slaveProperties.getCrn()) {
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, slave.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol.getAlarm() > 0) {
+ BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+ String errorName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("crnNo", slave.getId());
+ data.put("errorName", errorName);
+ list.add(data);
+ }
+ }
+ return R.ok().add(list);
+ }
/**
* 鑷姩琛ラ浂
--
Gitblit v1.9.1