From 93fc9c4b4f0e9bb25b5f2965511237faaf206e7c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 11:18:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 6c4dbef..60dfb34 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -45,6 +45,18 @@
}
/**
+ * 鑾峰彇鍏朵粬淇℃伅
+ */
+ @GetMapping("/other")
+ public R monitorOther() {
+
+
+ return R.ok(
+// Cools.add("year", calendar.get(Calendar.YEAR))
+ );
+ }
+
+ /**
* 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥�
*/
@GetMapping("/pakin/rep")
@@ -58,39 +70,98 @@
return R.ok(report);
}
+ /**
+ * 搴撲綅浣跨敤鎯呭喌缁熻
+ */
@GetMapping("/loc/rep")
public R monitorLocRep(){
- List<Map<String, Object>> result = new ArrayList<>();
+ List<Map<String, Object>> pie = new ArrayList<>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
if(locUseRate!=null) {
Map<String, Object> map = new HashMap<>();
- map.put("name", "鍦ㄥ簱搴撲綅");
+ map.put("name", "鍦ㄥ簱");
map.put("value", locUseRate.getFqty());
- result.add(map);
+ pie.add(map);
Map<String, Object> map1 = new HashMap<>();
- map1.put("name", "绌哄簱浣�");
+ map1.put("name", "绌�");
map1.put("value", locUseRate.getOqty());
- result.add(map1);
+ pie.add(map1);
Map<String, Object> map2 = new HashMap<>();
- map2.put("name", "浣跨敤搴撲綅");
+ map2.put("name", "浣跨敤");
map2.put("value", locUseRate.getUqty());
- result.add(map2);
+ pie.add(map2);
Map<String, Object> map3 = new HashMap<>();
- map3.put("name", "绂佺敤搴撲綅");
+ map3.put("name", "绂佺敤");
map3.put("value", locUseRate.getXqty());
- result.add(map3);
+ pie.add(map3);
}
- return R.ok(result);
+
+ // 鎬诲簱浣嶆暟
+ Integer total = (int) Arith.add(0, locUseRate.getFqty(), locUseRate.getOqty(), locUseRate.getUqty(), locUseRate.getXqty());
+ // 浣跨敤涓�
+ Integer used = locUseRate.getFqty() + locUseRate.getUqty();
+ // 搴撲綅浣跨敤鐜�
+ double usedDivides = Arith.divides(3, used, total);
+ double usedPr = Arith.multiplys(1, usedDivides, 100);
+
+ return R.ok(
+ Cools.add("pie", pie)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
+ );
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* 鑷姩琛ラ浂
*/
--
Gitblit v1.9.1