From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 9db7fc6..156f73b 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
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;
@@ -57,7 +58,7 @@
* 鑾峰彇鍏朵粬淇℃伅
*/
@GetMapping("/other")
- public R monitorOther(@RequestParam("crnId") Integer crnId) {
+ public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer ledId) {
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
Double zSpeed = 0.0D;
@@ -80,10 +81,10 @@
forkPos = 1;
break;
case 1:
- forkPos = 0;
+ forkPos = 2;
break;
case 2:
- forkPos = 2;
+ forkPos = 0;
break;
default:
forkPos = 1;
@@ -98,9 +99,9 @@
}
// 鑾峰彇杈撻�佺嚎plc绾跨▼
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, crnId);
- String ledContent = ledThread.getStringBuffer().toString();
- ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, ledId);
+ String ledContent = ledThread.getWorkNos().toString();
+// ledContent = "ask鐨勬ā鍧楄惃婊″ぇ绠椾簡钀ㄦ弧澶т簡\n 鏄獦澧冨埌鍩冨強鍡插鍡瞈n 钀ㄨ揪濮嗘墦寮�钀ㄦ弧澶у嚡鎾掗害褰撳姵钀ㄦ弧澶ц�佸笀";
return R.ok(
Cools.add("xSpeed", Arith.multiplys(1, Math.abs(xSpeed), 1)) // 琛岃蛋閫熷害
@@ -116,23 +117,7 @@
);
}
- /**
- * 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
- */
- @GetMapping("/pakin/rep")
- public R monitorPakinRep(){
- // 鍏ュ簱
- List<Map<String, Object>> pakinRep = reportQueryMapper.queryPakinRep();
- for (Map<String, Object> map : pakinRep) {
- if (map.get("node")!=null) {
- map.put("node", String.valueOf(map.get("node")).substring(5, 10));
- }
- }
- // 鍑哄簱
- List<Map<String, Object>> pakoutRep = reportQueryMapper.queryPakinRep();
- return R.ok(pakinRep);
- }
-
+ @RateLimit(2)
@GetMapping("/line/charts")
public R locIoLineCharts(){
Map<String,Object> map=new HashMap<String, Object>();
@@ -183,6 +168,7 @@
/**
* 搴撲綅浣跨敤鎯呭喌缁熻
*/
+ @RateLimit(2)
@GetMapping("/loc/rep")
public R monitorLocRep(){
List<Map<String, Object>> pie = new ArrayList<>();
--
Gitblit v1.9.1