From a4527344d04f8a4a1f4af0f0b9c1aa081e09aaa6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 29 Mar 2021 16:30:46 +0800
Subject: [PATCH] 用户数量改为客户数量

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
index 344944a..43ab996 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
@@ -35,6 +35,7 @@
 import org.springblade.jfpt.equipment.service.IEquipmentService;
 import org.springblade.jfpt.parcel.service.ParcelService;
 import org.springblade.jfpt.parcel.vo.ConditionVo;
+import org.springblade.jfpt.suser.service.ISuserService;
 import org.springblade.system.vo.DeptVO;
 import org.springframework.web.bind.annotation.*;
 import org.springblade.jfpt.catalog.wrapper.catalogWrapper;
@@ -63,6 +64,8 @@
 	private final ParcelService parcelService;
 
 	private final IEquipmentService iEquipmentService;
+
+	private final ISuserService iSuserService;
 
 	/**
 	 * 详情
@@ -230,10 +233,12 @@
 		Map<String, Object> mape = new HashMap<String, Object>();
 		Map<String, Object> maps = new HashMap<String, Object>();
 		Map<String, Object> mapse = new HashMap<String, Object>();
+		Map<String, Object> mapsu = new HashMap<String, Object>();
 		Integer alarmCount = null;
 		List<Integer> parcelCount = new ArrayList<>();
 		Integer contrabandCount = null;
 		Integer equipmentCount = null;
+		Integer suserCount = null;
 		Integer status = conditionVo.getStatus();
 		if (conditionVo.getStatus()==0){
 			//1.查询警情总数
@@ -244,34 +249,44 @@
 			equipmentCount = iEquipmentService.selectEquipmentCount(status);
 
 		}
+		//4.查询业主总数
+		suserCount = iSuserService.selectSuserCount();
+
 		//1.警情总数
 		mapa.put("value",alarmCount);
 		mapa.put("backgroundColor","#F56C6C");
-		mapa.put("prefixText","今日警情总数");
+		mapa.put("prefixText","今日警情");
 		mapa.put("suffixText","条");
 
 		//2.包裹总数
 		mape.put("value",parcelCount.get(0));
 		mape.put("backgroundColor","#67C23A");
-		mape.put("prefixText","今日违禁包裹总数");
+		mape.put("prefixText","今日违禁包裹");
 		mape.put("suffixText","个");
 
 		//3.违禁品总数
 		maps.put("value",parcelCount.get(1));
 		maps.put("backgroundColor","#E6A23C");
-		maps.put("prefixText","今日违禁物品总数");
+		maps.put("prefixText","今日违禁物品");
 		maps.put("suffixText","个");
 
 		//4.在线设备总数
 		mapse.put("value",equipmentCount);
 		mapse.put("backgroundColor","#409EFF");
-		mapse.put("prefixText","在线设备总数");
+		mapse.put("prefixText","在线设备");
 		mapse.put("suffixText","个");
+
+		//5.业主总数
+		mapsu.put("value",suserCount);
+		mapsu.put("backgroundColor","#00BFFF");
+		mapsu.put("prefixText","客户数量");
+		mapsu.put("suffixText","个");
 		//数据存入集合
 		lists.add(mapa);
 		lists.add(mape);
 		lists.add(maps);
 		lists.add(mapse);
+		lists.add(mapsu);
 		return lists;
 	}
 

--
Gitblit v1.9.3