From 7e6b4d0547e1b46df3cb3f0385e5d50ce3ca8a5d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 17 Mar 2021 15:48:42 +0800
Subject: [PATCH] 1.警情保留数据
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 44fa375..bc7dd83 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,6 +249,9 @@
equipmentCount = iEquipmentService.selectEquipmentCount(status);
}
+ //4.查询业主总数
+ suserCount = iSuserService.selectSuserCount();
+
//1.警情总数
mapa.put("value",alarmCount);
mapa.put("backgroundColor","#F56C6C");
@@ -267,11 +275,18 @@
mapse.put("backgroundColor","#409EFF");
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