From abbaf2374fff7d02ecc3eecd6bf62504fbf27c4b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 06 Apr 2021 22:33:25 +0800
Subject: [PATCH] 预警数量统计接口修改，预警数量分布接口修改，预警分类占比接口新增
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 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 43ab996..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
@@ -214,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) {
@@ -236,21 +232,17 @@
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.查询警情总数
- alarmCount = iAlarmService.selectAlarmCount(status);
- //2.查询包裹总数,违禁品总数
- parcelCount = parcelService.selectParcelCount(status);
- //3.查询在线设备总数
- equipmentCount = iEquipmentService.selectEquipmentCount(status);
-
- }
+ //查询今日警情
+ //1.查询警情总数
+ alarmCount = iAlarmService.selectAlarmCount(conditionVo);
+ //2.查询包裹总数,违禁品总数
+ parcelCount = parcelService.selectParcelCount(conditionVo);
+ //3.查询在线设备总数
+ equipmentCount = iEquipmentService.selectEquipmentCount(conditionVo);
//4.查询业主总数
- suserCount = iSuserService.selectSuserCount();
+ suserCount = iSuserService.selectSuserCount(conditionVo);
//1.警情总数
mapa.put("value",alarmCount);
--
Gitblit v1.9.3