From 90ffa7515c367e9be9a2c41e954757898ad2df94 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 15:27:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 4281297..633a26e 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -6,9 +6,14 @@
import com.zy.asrs.domain.vo.LocChartPie;
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.SlaveType;
+import com.zy.core.model.protocol.CrnProtocol;
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 java.util.*;
@@ -45,6 +50,39 @@
}
/**
+ * 鑾峰彇鍏朵粬淇℃伅
+ */
+ @GetMapping("/other")
+ public R monitorOther(@RequestParam("crnId") Integer crnId) {
+ Double xSpeed = 0.0D;
+ Double ySpeed = 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());
+ }
+ }
+ }
+
+ xSpeed = Double.valueOf(new Random().nextInt(10));
+ ySpeed = Double.valueOf(new Random().nextInt(10));
+
+ int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
+ int totalLoc = reportQueryMapper.getTotalLocByCrnId();
+
+ return R.ok(
+ Cools.add("xSpeed", xSpeed) // 琛岃蛋閫熷害
+ .add("ySpeed", ySpeed) // 鍗囬檷閫熷害
+ .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
+ .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
+
+ );
+ }
+
+ /**
* 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
*/
@GetMapping("/pakin/rep")
--
Gitblit v1.9.1