From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/catalog/controller/catalogController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 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 ab84eef..9feb09b 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;
/**
* 控制器
@@ -135,8 +133,59 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(catalogService.selectCatalogList());
+ List<Map<String, Object>> list = catalogService.selectCatalogList();
+ for (int i=0;i<list.size();i++){
+ Object pId = list.get(i).get("pId");
+ String s = pId.toString();
+ int i1 = Integer.parseInt(s);
+ if (i1==0){
+ list.get(i).put("isParent","true");
+ }
+ }
+
+ return R.data(list);
}
+ /**
+ * 总数
+ * @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","#FF0000");
+ mapa.put("prefixText","警情总数");
+ mapa.put("suffixText","条");
+ mape.put("value",list1.get(1).get("counta"));
+ mape.put("backgroundColor","#000000");
+ mape.put("prefixText","设备总数");
+ mape.put("suffixText","个");
+
+ maps.put("value",list1.get(2).get("counta"));
+ maps.put("backgroundColor","#6CDEFF");
+ maps.put("prefixText","用户总数");
+ maps.put("suffixText","个");
+
+ mapse.put("value",list1.get(3).get("counta"));
+ mapse.put("backgroundColor","#FF9900");
+ mapse.put("prefixText","出警队伍总数");
+ mapse.put("suffixText","队");
+ lists.add(mapa);
+ lists.add(mape);
+ lists.add(maps);
+ lists.add(mapse);
+ return R.data(lists);
+ }
+
}
--
Gitblit v1.9.3