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/mapper/ReportQueryMapper.java | 6 ++++++
src/main/webapp/views/monitor/js/monitor.js | 9 ++++++++-
src/main/java/com/zy/asrs/controller/MonitorController.java | 28 ++++++++++++++++++++++++++--
src/main/webapp/views/monitor/monitor.html | 17 +++++++----------
4 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index ac67824..633a26e 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -6,6 +6,10 @@
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;
@@ -50,12 +54,32 @@
*/
@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("year", calendar.get(Calendar.YEAR))
- ).add(crnId);
+ Cools.add("xSpeed", xSpeed) // 琛岃蛋閫熷害
+ .add("ySpeed", ySpeed) // 鍗囬檷閫熷害
+ .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
+ .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
+
+ );
}
/**
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index f2b91f4..f8285ce 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -27,4 +27,10 @@
@Select("select * from asr_loc_use_view")
LocChartPie getLocUseRate();
+ @Select("select count(1) as totalWrk from asr_wrk_mast_log where crn_no = #{crnNo}")
+ Integer getTotalWrkByCrnId(Integer crnNo);
+
+ @Select("select count(1) as totalLoc from asr_loc_mast")
+ Integer getTotalLocByCrnId();
+
}
diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index d1f7de9..eb192f3 100644
--- a/src/main/webapp/views/monitor/js/monitor.js
+++ b/src/main/webapp/views/monitor/js/monitor.js
@@ -53,7 +53,14 @@
http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId")}, function (res) {
if (res.code === 200){
- console.log(res);
+ $('#totalLoc').text(res.data.totalLoc);
+ $('#totalWrk').text(res.data.totalWrk);
+
+ $('#xSpeed').text(res.data.xSpeed);
+ $('#ySpeed').text(res.data.ySpeed);
+
+ // 璁℃暟鍔ㄧ敾
+ $('.counter').countUp();
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 987c282..2d519b2 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -124,7 +124,7 @@
<img src="img/a.png">
<div class="info-detail">
<div class="real-data">
- <i class="count">7777</i>
+ <i class="count" id="totalLoc">0</i>
<span class="unit">涓�</span>
</div>
<div class="content">搴撲綅鎬绘暟(涓�)</div>
@@ -134,17 +134,17 @@
<img src="img/b.png">
<div class="info-detail">
<div class="real-data">
- <i class="count">777</i>
- <span class="unit">涓�</span>
+ <i class="count" id="totalWrk">0</i>
+ <span class="unit">鎵�</span>
</div>
- <div class="content">浣跨敤涓簱浣�(涓�)</div>
+ <div class="content">鎬讳换鍔℃暟(鎵�)</div>
</div>
</div>
<div class="charge-info-elem">
<img src="img/c.png">
<div class="info-detail">
<div class="real-data">
- <i class="count">33</i>
+ <i class="count" id="">33</i>
<span class="unit">鎵�</span>
</div>
<div class="content">浠婃棩鍏ュ簱(鎵�)</div>
@@ -184,10 +184,10 @@
<div class="crn-speed">
<div class="speed-content">
<div>
- <span>鍫嗗灈鏈鸿蛋琛岄�熷害锛�</span><span class="counter">5.00</span><span>绫�/绉�</span>
+ <span>鍫嗗灈鏈鸿蛋琛岄�熷害锛�</span><span id="xSpeed" class="counter">5.00</span><span>绫�/绉�</span>
</div>
<div>
- <span>鍫嗗灈鏈哄崌闄嶉�熷害锛�</span><span class="counter">5.00</span><span>绫�/绉�</span>
+ <span>鍫嗗灈鏈哄崌闄嶉�熷害锛�</span><span id="ySpeed" class="counter">5.00</span><span>绫�/绉�</span>
</div>
</div>
</div>
@@ -358,9 +358,6 @@
//,anim: 'updown' //鍒囨崲鍔ㄧ敾鏂瑰紡
});
});
-
- // 璁℃暟鍔ㄧ敾
- $('.counter').countUp();
/***********************************************************************************/
/************************************* 鎶樼嚎鍥� ***************************************/
--
Gitblit v1.9.1