From bd97fda26e0432ae5634f6756b94f4169350c0f0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 21:55:21 +0800
Subject: [PATCH] 视频点位在线率mongo重构

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1001 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 504 insertions(+), 497 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 f779f18..23ffdc8 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,23 +1,30 @@
 package com.ycl.platform.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
+import com.ycl.platform.domain.entity.YwPoint;
 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.domain.result.UY.*;
+import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
+import com.ycl.platform.mapper.YwPointMapper;
 import com.ycl.platform.service.DataCenterService;
+import com.ycl.platform.service.YwPointService;
 import com.ycl.system.Result;
+import com.ycl.system.page.PageUtil;
 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.data.mongodb.core.query.TextCriteria;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 鏁版嵁涓績鎺ュ彛
@@ -30,6 +37,9 @@
 public class DataCenterServiceImpl implements DataCenterService {
 
     private final MongoTemplate mongoTemplate;
+    private final ImageResourceSecurityDetailMapper securityDetailMapper;
+    private final YwPointMapper pointMapper;
+
 
     private final static String TIME_FIELD = "mongoCreateTime";
 
@@ -41,246 +51,45 @@
      */
     @Override
     public Result videoPointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+        params.setTime();
+        // 鐢熸垚鏌ヨ
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null);
+
+        // 鍏堟煡鎬绘暟鍐嶅垎椤�
         long total = mongoTemplate.count(query, VideoOnlineResult.class);
-        query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
+        MongoUtil.setPage(query, params, TIME_FIELD);
         List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
-        return Result.ok().data(resultList).total(total);
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("count", Arrays.asList(total));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
-     * 瑙嗛锛氫竴鏈轰竴妗ｆ敞鍐岀巼
+     * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼
      *
      * @param params
      * @return
      */
     @Override
-    public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
-    }
+    public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+        params.setTime();
+        // 鍏堟煡鍑洪儴绾х偣浣嶇殑鍥芥爣
+        List<String> deptGBList = pointMapper.getDeptPointGB(0);
 
-    /**
-     * 瑙嗛锛氫竴鏈轰竴妗ｅ悎鏍肩巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
-    }
+        // 鐢熸垚鏌ヨ
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
 
-    /**
-     * 瑙嗛锛氭。妗堣�冩牳姣�
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoAssessmentFileRatio(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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 total = mongoTemplate.count(query, VideoOnlineResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
 
-    /**
-     * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoAvailabilityRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
-    }
-
-    /**
-     * 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
-    }
-
-    /**
-     * 瑙嗛锛氭爣娉ㄦ纭巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoLabelingAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
-    }
-
-    /**
-     * 瑙嗛锛氶噸鐐圭偣浣嶆爣娉ㄦ纭巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
-    }
-
-    /**
-     * 瑙嗛锛氭牎鏃舵纭巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoCheckTimeAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
-    }
-
-    /**
-     * 瑙嗛锛氶噸鐐圭偣浣嶆牎鏃舵纭巼
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("count", Arrays.asList(total));
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
     }
 
     /**
@@ -291,21 +100,25 @@
      */
     @Override
     public Result videoImportantPointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
+        params.setTime();
+        // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣
+        List<String> deptGBList = pointMapper.getDeptPointGB(1);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
+
+        long total = mongoTemplate.count(query, VideoOnlineResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+        // 缁熻鏁�
+        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.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);
     }
 
     /**
@@ -316,24 +129,242 @@
      */
     @Override
     public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
-        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);
+        params.setTime();
+        // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣
+        List<String> deptGBList = pointMapper.getDeptPointGB(2);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList);
+
+        long total = mongoTemplate.count(query, VideoOnlineResult.class);
+        MongoUtil.setPage(query, params, TIME_FIELD);
+        List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+        // 缁熻鏁�
+        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.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);
     }
 
+    /**
+     * 瑙嗛锛氫竴鏈轰竴妗ｆ敞鍐岀巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoOneMachineDocumentRegister(DataCenterQuery params) {
 
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, OneMachineFileResult.class);
+        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.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);
+        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);
+    }
+
+    /**
+     * 瑙嗛锛氫竴鏈轰竴妗ｅ悎鏍肩巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+        List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
+        // 缁熻鏁�
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("count", CollectionUtils.EMPTY_COLLECTION);
+        map.put("list", resultList);
+        return Result.ok().data(map).total(total);
+    }
+
+    /**
+     * 瑙嗛锛氭。妗堣�冩牳姣�
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoAssessmentFileRatio(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, OneMachineFileResult.class);
+        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.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);
+        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);
+    }
+
+    /**
+     * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoAvailabilityRate(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        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 videoImportantPointAvailabilityRate(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+        // 缁熻鏁�
+        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);
+    }
+
+    /**
+     * 瑙嗛锛氭爣娉ㄦ纭巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoLabelingAccuracy(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
+        List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
+        // 缁熻鏁�
+        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), RecordMetaDSumResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), RecordMetaDSumResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), RecordMetaDSumResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), RecordMetaDSumResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), RecordMetaDSumResult.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);
+    }
+
+    /**
+     * 瑙嗛锛氶噸鐐圭偣浣嶆爣娉ㄦ纭巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, OsdCheckResult.class);
+        List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.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);
+        return Result.ok().data(map).total(total);
+    }
+
+    /**
+     * 瑙嗛锛氭牎鏃舵纭巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoCheckTimeAccuracy(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, OneMachineFileResult.class);
+        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.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);
+        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);
+    }
+
+    /**
+     * 瑙嗛锛氶噸鐐圭偣浣嶆牎鏃舵纭巼
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
+        long total = mongoTemplate.count(query, OneMachineFileResult.class);
+        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.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);
+        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);
+    }
 
 
     /**
@@ -344,21 +375,20 @@
      */
     @Override
     public Result vehicleViewDockStable(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -369,21 +399,20 @@
      */
     @Override
     public Result vehiclePointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -394,21 +423,21 @@
      */
     @Override
     public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -419,21 +448,20 @@
      */
     @Override
     public Result vehicleCollectionConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -444,21 +472,16 @@
      */
     @Override
     public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -469,21 +492,16 @@
      */
     @Override
     public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -494,21 +512,19 @@
      */
     @Override
     public Result vehicleClockAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -519,21 +535,16 @@
      */
     @Override
     public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -544,21 +555,16 @@
      */
     @Override
     public Result vehicleUrlAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -569,21 +575,16 @@
      */
     @Override
     public Result vehicleBigImgAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -594,21 +595,20 @@
      */
     @Override
     public Result faceViewDockStable(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -619,21 +619,20 @@
      */
     @Override
     public Result facePointOnlineRate(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -644,21 +643,21 @@
      */
     @Override
     public Result faceDirectoryConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -669,21 +668,20 @@
      */
     @Override
     public Result faceCollectionConsistency(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -694,21 +692,20 @@
      */
     @Override
     public Result faceImgQualification(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -719,21 +716,19 @@
      */
     @Override
     public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -744,21 +739,19 @@
      */
     @Override
     public Result faceTimelyUpload(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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);
     }
 
     /**
@@ -769,20 +762,34 @@
      */
     @Override
     public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
-        Query query = new Query();
-        // 鍏ㄦ枃绱㈠紩鏌ヨ
-        MongoUtil.fullText(query, params.getKeyword());
-        Criteria criteria = new Criteria();
-        // 鏅�氭煡璇�
-        if (Objects.nonNull(params.getStartTime()) && Objects.nonNull(params.getEndTime())) {
-            criteria.andOperator(
-                    Criteria.where(TIME_FIELD).gte(params.getStartTime()).lte(params.getEndTime())
-            );
-        }
-        query.addCriteria(criteria);
+
+        Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>());
+
         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