From f1599c97d20fd7fabb1683b1cf7ba4114306c7ad Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 14 Jan 2021 10:51:45 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/catalog/controller/catalogController.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 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 f516a71..8d2133c 100644
--- a/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
+++ b/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
@@ -30,9 +30,6 @@
import org.springblade.modules.catalog.entitly.catalog;
import org.springblade.modules.catalog.service.catalogService;
import org.springblade.modules.catalog.vo.catalogVO;
-import org.springblade.modules.deploy.entity.Deploy;
-import org.springblade.modules.deploy.service.IDeployService;
-import org.springblade.modules.deploy.vo.DeployVO;
import org.springblade.modules.catalog.wrapper.catalogWrapper;
import org.springframework.web.bind.annotation.*;
@@ -42,6 +39,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Pattern;
/**
* 控制器
@@ -149,4 +147,88 @@
}
+ /**
+ * 总数
+ * @param response
+ * @return
+ */
+ @GetMapping("/selectCount")
+ public R selectCount(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>> lists = new ArrayList<>();
+ List<Map<String, Object>> list1 = catalogService.selectCount();
+ Map<String, Object> mapa = new HashMap<String, Object>();
+ Map<String, Object> mape = new HashMap<String, Object>();
+ 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","#F56C6C");
+ mapa.put("prefixText","警情总数");
+ mapa.put("suffixText","条");
+ mape.put("value",list1.get(1).get("counta"));
+ mape.put("backgroundColor","#67C23A");
+ mape.put("prefixText","设备总数");
+ mape.put("suffixText","个");
+
+ maps.put("value",list1.get(2).get("counta"));
+ maps.put("backgroundColor","#409EFF");
+ maps.put("prefixText","用户总数");
+ maps.put("suffixText","个");
+
+ mapse.put("value",list1.get(3).get("counta"));
+ mapse.put("backgroundColor","#E6A23C");
+ mapse.put("prefixText","处警队伍总数");
+ mapse.put("suffixText","人");
+ lists.add(mapa);
+ lists.add(mape);
+ lists.add(maps);
+ lists.add(mapse);
+ 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