From 3d5198eca9b5a6b7114f48936b0e46068236be80 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 01:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 185 +++++++++++++++++++++++++++++----------------
1 files changed, 118 insertions(+), 67 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 23ffdc8..1693bed 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
@@ -51,7 +51,6 @@
*/
@Override
public Result videoPointOnlineRate(DataCenterQuery params) {
- params.setTime();
// 鐢熸垚鏌ヨ
Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null);
@@ -74,7 +73,6 @@
*/
@Override
public Result deptVideoPointOnlineRate(DataCenterQuery params) {
- params.setTime();
// 鍏堟煡鍑洪儴绾х偣浣嶇殑鍥芥爣
List<String> deptGBList = pointMapper.getDeptPointGB(0);
@@ -100,7 +98,6 @@
*/
@Override
public Result videoImportantPointOnlineRate(DataCenterQuery params) {
- params.setTime();
// 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣
List<String> deptGBList = pointMapper.getDeptPointGB(1);
@@ -129,7 +126,6 @@
*/
@Override
public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
- params.setTime();
// 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣
List<String> deptGBList = pointMapper.getDeptPointGB(2);
@@ -159,16 +155,17 @@
@Override
public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
- long total = mongoTemplate.count(query, OneMachineFileResult.class);
- List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
// 缁熻鏁�
- 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);
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), MonitorQualifyResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), MonitorQualifyResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), MonitorQualifyResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), MonitorQualifyResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), MonitorQualifyResult.class);
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
map.put("list", resultList);
@@ -184,9 +181,10 @@
@Override
public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
@@ -203,17 +201,18 @@
*/
@Override
public Result videoAssessmentFileRatio(DataCenterQuery params) {
+ // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
-
- long total = mongoTemplate.count(query, OneMachineFileResult.class);
- List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
// 缁熻鏁�
- 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);
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), MonitorQualifyResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), MonitorQualifyResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), MonitorQualifyResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), MonitorQualifyResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), MonitorQualifyResult.class);
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
map.put("list", resultList);
@@ -229,9 +228,36 @@
@Override
public Result videoAvailabilityRate(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "deviceId", "createTime", null);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+ MongoUtil.setPage(query, params, "createTime");
+ List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ // 缁熻鏁�
+ long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), RecordMetaDSumResult.class);
+ long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), RecordMetaDSumResult.class);
+ long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), RecordMetaDSumResult.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);
+ }
+
+ /**
+ * 瑙嗛锛氶儴绾у綍鍍忓彲鐢ㄧ巼
+ *
+ * @param params
+ * @return
+ */
+ @Override
+ public Result deptVideoAvailabilityRate(DataCenterQuery params) {
+
+ List<String> deptGBList = pointMapper.getDeptPointGB(0);
+
+ Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
+
+ long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+ MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), RecordMetaDSumResult.class);
@@ -252,9 +278,12 @@
@Override
public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ List<String> deptGBList = pointMapper.getDeptPointGB(1);
+
+ Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+ MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), OneMachineFileResult.class);
@@ -300,9 +329,11 @@
@Override
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ List<String> deptGBList = pointMapper.getDeptPointGB(1);
+ Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList);
long total = mongoTemplate.count(query, OsdCheckResult.class);
+ MongoUtil.setPage(query, params, "checkTime");
List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
// 缁熻鏁�
long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OsdCheckResult.class);
@@ -350,16 +381,19 @@
@Override
public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ List<String> deptGBList = pointMapper.getDeptPointGB(1);
- long total = mongoTemplate.count(query, OneMachineFileResult.class);
- List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ Query query = MongoUtil.getQuery(params, "deviceId", "checkTime", deptGBList);
+
+ long total = mongoTemplate.count(query, OsdCheckResult.class);
+ MongoUtil.setPage(query, params, "checkTime");
+ List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
// 缁熻鏁�
- 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);
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OsdCheckResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OsdCheckResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), OsdCheckResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), OsdCheckResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), OsdCheckResult.class);
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
map.put("list", resultList);
@@ -376,9 +410,10 @@
@Override
public Result vehicleViewDockStable(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -400,9 +435,10 @@
@Override
public Result vehiclePointOnlineRate(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -424,16 +460,17 @@
@Override
public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
- long total = mongoTemplate.count(query, OneMachineFileResult.class);
- List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
// 缁熻鏁�
- 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);
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), MonitorQualifyResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), MonitorQualifyResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), MonitorQualifyResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), MonitorQualifyResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), MonitorQualifyResult.class);
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
map.put("list", resultList);
@@ -449,9 +486,10 @@
@Override
public Result vehicleCollectionConsistency(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, CrossDetailResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
@@ -473,9 +511,10 @@
@Override
public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
@@ -493,9 +532,10 @@
@Override
public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
@@ -513,9 +553,10 @@
@Override
public Result vehicleClockAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), VehicleDeviceInspectionResult.class);
@@ -536,9 +577,10 @@
@Override
public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
@@ -556,9 +598,10 @@
@Override
public Result vehicleUrlAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, PicAccessResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
@@ -576,9 +619,10 @@
@Override
public Result vehicleBigImgAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, new ArrayList<>());
long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
@@ -596,9 +640,10 @@
@Override
public Result faceViewDockStable(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -620,9 +665,10 @@
@Override
public Result facePointOnlineRate(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class);
@@ -644,16 +690,17 @@
@Override
public Result faceDirectoryConsistency(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null);
- long total = mongoTemplate.count(query, OneMachineFileResult.class);
- List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+ long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
// 缁熻鏁�
- 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);
+ long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), MonitorQualifyResult.class);
+ long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), MonitorQualifyResult.class);
+ long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), MonitorQualifyResult.class);
+ long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), MonitorQualifyResult.class);
+ long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), MonitorQualifyResult.class);
HashMap<String, Object> map = new HashMap<>();
map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
map.put("list", resultList);
@@ -669,9 +716,10 @@
@Override
public Result faceCollectionConsistency(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, CrossDetailResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class);
@@ -693,9 +741,10 @@
@Override
public Result faceImgQualification(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null);
long total = mongoTemplate.count(query, MonitoringDetailResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), MonitoringDetailResult.class);
@@ -717,9 +766,10 @@
@Override
public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
@@ -740,9 +790,10 @@
@Override
public Result faceTimelyUpload(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
// 缁熻鏁�
long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class);
@@ -763,9 +814,10 @@
@Override
public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
- Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+ Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null);
long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
@@ -781,9 +833,8 @@
*/
@Override
public Result videoImageResourceSecurity(DataCenterQuery query) {
- ImageResourceSecurityDetail imageResourceSecurityDetail = new ImageResourceSecurityDetail();
Page<ImageResourceSecurityDetail> page = PageHelper.startPage(query.getPageNum(), query.getPageSize());
- securityDetailMapper.selectImageResourceSecurityDetailList(imageResourceSecurityDetail);
+ securityDetailMapper.selectImageResourceSecurityDetailList(query);
// 缁熻鏁�
HashMap<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0