From 49e023b28af6d32dad613c19eb6eb2701cdcc040 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 14 Jan 2021 15:37:29 +0800
Subject: [PATCH] 客户列表接口修改
---
src/main/java/org/springblade/modules/catalog/controller/catalogController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/catalog/controller/catalogController.java b/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
index 9feb09b..8d2133c 100644
--- a/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
+++ b/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
@@ -164,23 +164,23 @@
Map<String, Object> maps = new HashMap<String, Object>();
Map<String, Object> mapse = new HashMap<String, Object>();
mapa.put("value",list1.get(0).get("counta"));
- mapa.put("backgroundColor","#FF0000");
+ mapa.put("backgroundColor","#F56C6C");
mapa.put("prefixText","警情总数");
mapa.put("suffixText","条");
mape.put("value",list1.get(1).get("counta"));
- mape.put("backgroundColor","#000000");
+ mape.put("backgroundColor","#67C23A");
mape.put("prefixText","设备总数");
mape.put("suffixText","个");
maps.put("value",list1.get(2).get("counta"));
- maps.put("backgroundColor","#6CDEFF");
+ maps.put("backgroundColor","#409EFF");
maps.put("prefixText","用户总数");
maps.put("suffixText","个");
mapse.put("value",list1.get(3).get("counta"));
- mapse.put("backgroundColor","#FF9900");
- mapse.put("prefixText","出警队伍总数");
- mapse.put("suffixText","队");
+ mapse.put("backgroundColor","#E6A23C");
+ mapse.put("prefixText","处警队伍总数");
+ mapse.put("suffixText","人");
lists.add(mapa);
lists.add(mape);
lists.add(maps);
@@ -188,4 +188,47 @@
return R.data(lists);
}
+
+ /**
+ * 按行政区统计用户数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectAddvcd")
+ public R selectAddvcd(HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ List<Map<String, Object>> list = catalogService.selectAddvcd();
+ return R.data(list);
+ }
+
+ /**
+ * 按行政区统计设备数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectEq")
+ public R selectEq(HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ List<Map<String, Object>> list = catalogService.selectEq();
+ return R.data(list);
+ }
+
+ /**
+ * 按警情类型查询数量
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectWar")
+ public R selectWar(HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
+ List<Map<String, Object>> list = catalogService.selectWar();
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3