From 123cf89ee4b76d1355b5bb9eaf70538c5264f18c Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 03 九月 2024 09:26:15 +0800
Subject: [PATCH] fix：修复图形资源空指针异常
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 319 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 281 insertions(+), 38 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index 8b0c6d6..a653ef3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -1,21 +1,28 @@
package com.ycl.platform.service.impl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.result.UY.VideoOnlineResult;
+import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
import com.ycl.platform.service.DataCenterService;
import com.ycl.system.Result;
import com.ycl.utils.MongoUtil;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.Objects;
@@ -30,7 +37,7 @@
public class DataCenterServiceImpl implements DataCenterService {
private final MongoTemplate mongoTemplate;
-
+ private final ImageResourceSecurityDetailMapper securityDetailMapper;
private final static String TIME_FIELD = "mongoCreateTime";
/**
@@ -55,7 +62,22 @@
long total = mongoTemplate.count(query, VideoOnlineResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
- return Result.ok().data(resultList).total(total);
+
+ // 缁熻
+ Criteria criteriaCount = new Criteria();
+ // 鏅�氭煡璇�
+ if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
+ criteriaCount.andOperator(
+ Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
+ );
+ }
+ Query countQuery = new Query();
+ countQuery.addCriteria(criteriaCount);
+ long count = mongoTemplate.count(countQuery, VideoOnlineResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(count));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -80,7 +102,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -105,7 +136,11 @@
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -130,7 +165,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -155,7 +199,14 @@
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), OneMachineFileResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), OneMachineFileResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -180,7 +231,14 @@
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), OneMachineFileResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), OneMachineFileResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -189,7 +247,6 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
public Result videoLabelingAccuracy(DataCenterQuery params) {
Query query = new Query();
@@ -206,7 +263,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -215,7 +281,6 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
Query query = new Query();
@@ -232,7 +297,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -241,7 +315,6 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
public Result videoCheckTimeAccuracy(DataCenterQuery params) {
Query query = new Query();
@@ -258,7 +331,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -267,7 +349,6 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
Query query = new Query();
@@ -284,7 +365,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -293,7 +383,6 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
public Result videoImportantPointOnlineRate(DataCenterQuery params) {
Query query = new Query();
@@ -310,7 +399,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -319,7 +417,6 @@
* @param params
* @return
*/
- // TODO 杩斿洖鏁版嵁瀵硅薄鏇存崲
@Override
public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
Query query = new Query();
@@ -336,7 +433,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
@@ -364,7 +470,15 @@
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -389,7 +503,15 @@
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -414,7 +536,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -439,7 +570,15 @@
long total = mongoTemplate.count(query, CrossDetailResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), CrossDetailResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), CrossDetailResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), CrossDetailResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -464,7 +603,11 @@
long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -489,7 +632,11 @@
long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -514,7 +661,14 @@
long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), VehicleDeviceInspectionResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), VehicleDeviceInspectionResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), VehicleDeviceInspectionResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -539,7 +693,11 @@
long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -564,7 +722,11 @@
long total = mongoTemplate.count(query, PicAccessResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -589,7 +751,11 @@
long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -614,7 +780,15 @@
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -623,7 +797,6 @@
* @param params
* @return
*/
- // TODO 鏇存崲鍝嶅簲缁撴灉
@Override
public Result facePointOnlineRate(DataCenterQuery params) {
Query query = new Query();
@@ -640,7 +813,15 @@
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -665,7 +846,16 @@
long total = mongoTemplate.count(query, OneMachineFileResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -690,7 +880,15 @@
long total = mongoTemplate.count(query, CrossDetailResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), CrossDetailResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), CrossDetailResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), CrossDetailResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -715,7 +913,15 @@
long total = mongoTemplate.count(query, MonitoringDetailResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), MonitoringDetailResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), MonitoringDetailResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), MonitoringDetailResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), MonitoringDetailResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, three, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -740,7 +946,14 @@
long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -765,7 +978,14 @@
long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class);
+ long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class);
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(one, two, four));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
}
/**
@@ -790,6 +1010,29 @@
long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
- return Result.ok().data(resultList).total(total);
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
+ }
+ /**
+ * 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞�
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public Result videoImageResourceSecurity(DataCenterQuery query) {
+ ImageResourceSecurityDetail imageResourceSecurityDetail = new ImageResourceSecurityDetail();
+ Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
+ securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);
+
+ // 缁熻鏁�
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", CollectionUtils.EMPTY_COLLECTION);
+ map.put("list", page);
+ return Result.ok().data(map).total(page.getTotal());
+
}
}
--
Gitblit v1.8.0