From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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..3be319f 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;
/**
* 详情
@@ -211,17 +214,13 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- if (conditionVo.getStatus()!=null){
- //数据返回
- return R.data(getIndexCountData(conditionVo));
- }
//数据返回
- return null;
+ return R.data(getIndexCountData(conditionVo));
}
/**
* 按时间条件查询统计数据
- * @param conditionVo 条件 status 0:本日 1：本周 2：本月
+ * @param conditionVo 条件 status 0:本日 1：本周 2：本月 startTime endTime时间条件查询
* @return
*/
private List<Map<String, Object>> getIndexCountData(ConditionVo conditionVo) {
@@ -230,20 +229,21 @@
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 status = conditionVo.getStatus();
- if (conditionVo.getStatus()==0){
- //1.查询警情总数
- alarmCount = iAlarmService.selectAlarmCount(status);
- //2.查询包裹总数,违禁品总数
- parcelCount = parcelService.selectParcelCount(status);
- //3.查询在线设备总数
- equipmentCount = iEquipmentService.selectEquipmentCount(status);
+ Integer suserCount = null;
+ //查询今日警情
+ //1.查询警情总数
+ alarmCount = iAlarmService.selectAlarmCount(conditionVo);
+ //2.查询包裹总数,违禁品总数
+ parcelCount = parcelService.selectParcelCount(conditionVo);
+ //3.查询在线设备总数
+ equipmentCount = iEquipmentService.selectEquipmentCount(conditionVo);
+ //4.查询业主总数
+ suserCount = iSuserService.selectSuserCount(conditionVo);
- }
//1.警情总数
mapa.put("value",alarmCount);
mapa.put("backgroundColor","#F56C6C");
@@ -267,11 +267,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