From b5ccfa77fc6e4a895818f987887207bb0d2b824a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 18 十一月 2020 17:03:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 11 +++++++++++
src/main/java/com/zy/asrs/controller/MonitorController.java | 9 ++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index f077b4d..104dfce 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -99,13 +99,16 @@
*/
@GetMapping("/pakin/rep")
public R monitorPakinRep(){
- List<Map<String, Object>> report = reportQueryMapper.queryPakinRep();
- for (Map<String, Object> map : report) {
+ // 鍏ュ簱
+ 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));
}
}
- return R.ok(report);
+ // 鍑哄簱
+ List<Map<String, Object>> pakoutRep = reportQueryMapper.queryPakinRep();
+ return R.ok(pakinRep);
}
/**
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index f8285ce..1b84325 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -24,6 +24,17 @@
"order by Min(wm.io_time) asc\n")
List<Map<String, Object>> queryPakinRep();
+ @Select("select\n" +
+ "Min(wm.io_time) as node,\n" +
+ "isnull(count(1), 0) as val\n" +
+ "from asr_wrk_mast_log wm\n" +
+ "where 1=1\n" +
+ "and ((wm.wrk_sts = 15 AND wm.io_type = 101) OR (wm.wrk_sts = 14 AND wm.io_type = 103))\n" +
+ "and datediff(d, wm.io_time, getdate())<=7\n" +
+ "group by datediff(day,wm.io_time,getdate())\n" +
+ "order by Min(wm.io_time) asc")
+ List<Map<String, Object>> queryPakOutRep();
+
@Select("select * from asr_loc_use_view")
LocChartPie getLocUseRate();
--
Gitblit v1.9.1