From ebcaed76a00f824e57ccd7e2c38efe725e160374 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 16:02:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 633a26e..f077b4d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -56,6 +56,11 @@
public R monitorOther(@RequestParam("crnId") Integer crnId) {
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
+ Double xDistance = 0.0D;
+ 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) {
@@ -63,6 +68,10 @@
if (crnProtocol != null) {
xSpeed = Double.valueOf(crnProtocol.getXSpeed());
ySpeed = Double.valueOf(crnProtocol.getYSpeed());
+ xDistance = Double.valueOf(crnProtocol.getXDistance());
+ yDistance = Double.valueOf(crnProtocol.getYDistance());
+ xDuration = Double.valueOf(crnProtocol.getXDuration());
+ yDuration = Double.valueOf(crnProtocol.getYDuration());
}
}
}
@@ -70,15 +79,18 @@
xSpeed = Double.valueOf(new Random().nextInt(10));
ySpeed = Double.valueOf(new Random().nextInt(10));
- int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
- int totalLoc = reportQueryMapper.getTotalLocByCrnId();
+// 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) // 鎬讳换鍔℃暟
-
+// .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
+// .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
+ .add("xDistance", xDistance) // 绱璧拌璺濈km
+ .add("yDistance", yDistance) // 绱鍗囬檷璺濈km
+ .add("xDuration", xDuration) // 绱璧拌鏃堕暱h
+ .add("yDuration", yDuration) // 绱鍗囬檷鏃堕暱h
);
}
--
Gitblit v1.9.1