From 99cc61dad74f04a7616c3541f5e87762585abb93 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期四, 24 十月 2024 15:33:58 +0800
Subject: [PATCH] 白名单导入
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1006 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 763 insertions(+), 243 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 39fb39a..f0c00c6 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,5 +1,6 @@
package com.ycl.platform.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.pagehelper.Page;
@@ -10,7 +11,9 @@
import com.ycl.platform.domain.entity.*;
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.*;
+import com.ycl.platform.domain.vo.PointDetailVO;
import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.*;
@@ -18,11 +21,14 @@
import com.ycl.system.page.PageUtil;
import com.ycl.utils.DateUtils;
import com.ycl.utils.MongoUtil;
+import constant.ApiConstants;
+import constant.CheckConstants;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections.CollectionUtils;
import org.bson.Document;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.*;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.TextCriteria;
@@ -30,6 +36,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -53,6 +60,8 @@
private final static String TIME_FIELD = "mongoCreateTime";
+ private static DecimalFormat DF = new DecimalFormat("#.####");
+
/**
* 瑙嗛锛氱偣浣嶅湪绾跨巼
*
@@ -61,24 +70,91 @@
*/
@Override
public Result videoPointOnlineRate(DataCenterQuery params) {
- // 鐢熸垚鏌ヨ
- List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
- // 鍏堟煡鎬绘暟鍐嶅垎椤�
- long total = mongoTemplate.count(query, VideoOnlineResult.class);
+ //鏌ヨ棰戣澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ if(params.getOption()!=null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
+ }
+ // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+ query.with(Sort.by(Sort.Order.asc("pingOnline")));
+ //鍒嗛〉鏁伴噺
+ long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
- List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ resultList.forEach(item -> {
+ if(item.getPingOnline() ==null){
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else if(!item.getPingOnline()){
+ item.setPingOnlineStr("绂荤嚎");
+ }
+ if(1== item.getOnline() ){
+ item.setOnlineStr("鍦ㄧ嚎");
+ }else if(-1==item.getOnline()){
+ item.setOnlineStr("绂荤嚎");
+ }else {
+ item.setOnlineStr("鏈煡");
+ }
+ });
+ params.setDeptTag(-1);
+ params.setDeviceType(1);
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_online");
- long distinctCount = collection.distinct("deviceId", String.class).into(new ArrayList<>()).size();
- Date now = new Date();
- List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
- .select(CheckIndexVideo::getSiteOnline)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
- .list();
+ //鍗＄墖缁熻
+ int totalCount =0;
+ int onlineCount =0;
+ int offlineCount =0;
+ int unknownCount =0;
+ //鏋勫缓鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ // 娣诲姞鍥哄畾鏉′欢
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+ // 鏋勫缓match鎿嶄綔
+ MatchOperation match = Aggregation.match(
+ new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+ );
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+ // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+ for (Map<String, Object> result : results.getMappedResults()) {
+ offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+ unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ totalCount = offlineCount + unknownCount + onlineCount;
+ }
+ /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
+ // 鍒涘缓涓�涓猀ueryWrapper瀹炰緥
+ QueryWrapper<CheckIndexVideo> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().select(CheckIndexVideo::getSiteOnline) // 閫夋嫨瑕佹煡璇㈢殑瀛楁
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime()); // 璁剧疆鏃堕棿鑼冨洿鏉′欢
+ if (params.getDataType() == 0) {
+ //鍖哄幙
+ queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_County);
+ }else if(params.getDataType() == 1){
+ //鐪佸巺
+ queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province);
+ }else if(params.getDataType() == 2){
+ //鍏畨閮�
+ queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept);
+ }
+ // 浣跨敤QueryWrapper鎵ц鏌ヨ
+ List<CheckIndexVideo> videoList = checkIndexVideoService.getBaseMapper().selectList(queryWrapper);
+
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
BigDecimal sum = videoList.stream().map(CheckIndexVideo::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -86,7 +162,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(distinctCount + "",onlineRate + "%"));
+ map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -99,39 +175,79 @@
*/
@Override
public Result deptVideoPointOnlineRate(DataCenterQuery params) {
-
- List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
- // 鐢熸垚鏌ヨ
- Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 1);
-
- // 鍏堟煡鎬绘暟鍐嶅垎椤�
- long total = mongoTemplate.count(query, VideoOnlineResult.class);
- MongoUtil.setPage(query, params, TIME_FIELD);
- List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
-
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_online");
- Document filter = new Document("deptTag", new Document("$eq", Boolean.TRUE));
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- // 鍙閮ㄧ骇鐨�
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ //鏌ヨ棰戣澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ if(params.getOption()!=null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
}
- Date now = new Date();
+ // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+ query.with(Sort.by(Sort.Order.asc("pingOnline")));
+ //鍒嗛〉鏁伴噺
+ long total = mongoTemplate.count(query, TMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ resultList.forEach(item -> {
+ if(item.getPingOnline() ==null){
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else if(!item.getPingOnline()){
+ item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
+ });
+ // 缁熻璁惧鏁伴噺
+ //鍗＄墖缁熻
+ int totalCount =0;
+ int onlineCount =0;
+ int offlineCount =0;
+ int unknownCount =0;
+ //鏋勫缓鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ // 娣诲姞鍥哄畾鏉′欢
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+ // 鏋勫缓match鎿嶄綔
+ MatchOperation match = Aggregation.match(
+ new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+ );
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+ // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+ for (Map<String, Object> result : results.getMappedResults()) {
+ offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+ unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ totalCount = offlineCount + unknownCount + onlineCount;
+ }
+
+ params.setDeptTag(1);
+ params.setDeviceType(1);
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getMinistrySiteOnline)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -140,7 +256,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%"));
+ map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -153,36 +269,79 @@
*/
@Override
public Result videoImportantPointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
- Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 3);
-
- long total = mongoTemplate.count(query, VideoOnlineResult.class);
- MongoUtil.setPage(query, params, TIME_FIELD);
- List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
-
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_online");
- Document filter = new Document("importantTag", new Document("$eq", Boolean.TRUE));
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ //鏌ヨ棰戣澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ if(params.getOption()!=null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
}
+ // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+ query.with(Sort.by(Sort.Order.asc("pingOnline")));
+ //鍒嗛〉鏁伴噺
+ long total = mongoTemplate.count(query, TMonitorResult.class);
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ params.setDeptTag(3);
+ params.setDeviceType(1);
+ resultList.forEach(item -> {
+ if(item.getPingOnline() ==null){
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else if(!item.getPingOnline()){
+ item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
+ });
- Date now = new Date();
+ // 缁熻璁惧鏁伴噺
+ //鍗＄墖缁熻
+ int totalCount =0;
+ int onlineCount =0;
+ int offlineCount =0;
+ int unknownCount =0;
+ //鏋勫缓鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ // 娣诲姞鍥哄畾鏉′欢
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+ // 鏋勫缓match鎿嶄綔
+ MatchOperation match = Aggregation.match(
+ new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+ );
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+ // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+ for (Map<String, Object> result : results.getMappedResults()) {
+ offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+ unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ totalCount = offlineCount + unknownCount + onlineCount;
+ }
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeySiteOnline)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -191,7 +350,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%"));
+ map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -204,36 +363,81 @@
*/
@Override
public Result videoImportantPointImageOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId");
- Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 4);
-
- long total = mongoTemplate.count(query, VideoOnlineResult.class);
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
+ Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ //鏌ヨ棰戣澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ query.addCriteria(Criteria.where("importantCommandImageTag").is(Boolean.TRUE));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ if(params.getOption()!=null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
+ }
+ // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+ query.with(Sort.by(Sort.Order.asc("pingOnline")));
+ //鍒嗛〉鏁伴噺
+ long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
- List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_online");
- Document filter = new Document("importantCommandImageTag", new Document("$eq", Boolean.TRUE));
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
+ params.setDeptTag(4);
+ params.setDeviceType(1);
+ resultList.forEach(item -> {
+ if(item.getPingOnline() ==null){
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else if(!item.getPingOnline()){
+ item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
+ });
+
+ // 缁熻璁惧鏁伴噺
+ //鍗＄墖缁熻
+ int totalCount =0;
+ int onlineCount =0;
+ int offlineCount =0;
+ int unknownCount =0;
+ //鏋勫缓鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ // 娣诲姞鍥哄畾鏉′欢
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+ // 鏋勫缓match鎿嶄綔
+ MatchOperation match = Aggregation.match(
+ new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
);
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+ // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+ for (Map<String, Object> result : results.getMappedResults()) {
+ offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+ unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ totalCount = offlineCount + unknownCount + onlineCount;
}
- Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeyCommandImageOnline)
- .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -242,7 +446,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%"));
+ map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -266,10 +470,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
- Document ipErrFilter = new Document("ip.error", true);
- Document macdzErrFilter = new Document("macdz.error", true);
- Document latitudeErrFilter = new Document("latitude.error", true);
- Document longitudeErrFilter = new Document("longitude.error", true);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -293,6 +509,7 @@
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getMonitorRegistration)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -301,7 +518,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -327,10 +544,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
- Document ipErrFilter = new Document("ip.error", true);
- Document macdzErrFilter = new Document("macdz.error", true);
- Document latitudeErrFilter = new Document("latitude.error", true);
- Document longitudeErrFilter = new Document("longitude.error", true);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -354,6 +583,7 @@
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getMonitorQualification)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -362,7 +592,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -377,7 +607,6 @@
*/
@Override
public Result videoAssessmentFileRatio(DataCenterQuery params) {
- // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳
List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
@@ -389,10 +618,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
- Document ipErrFilter = new Document("ip.error", true);
- Document macdzErrFilter = new Document("macdz.error", true);
- Document latitudeErrFilter = new Document("latitude.error", true);
- Document longitudeErrFilter = new Document("longitude.error", true);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -429,7 +670,7 @@
@Override
public Result videoAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
- Query query = MongoUtil.getQuery(params,"createTime", likeFileds, null);
+ Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -440,7 +681,10 @@
MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
List<Integer> status = Arrays.asList(1, 0, -1);
List<String> resultCount = status.stream().map(item -> {
- Document filter = new Document("recordStatus", item);
+ List<Document> dList = new ArrayList<>(2);
+ dList.add(new Document("recordStatus", new Document("$eq", item)));
+ setTag(params, dList);
+ Document filter = new Document("$and", dList);
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
new Document("$match", filter),
@@ -461,6 +705,7 @@
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getVideoAvailable)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -469,7 +714,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- resultCount.add(onlineRate + "%");
+ resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
map.put("list", resultList);
@@ -485,7 +730,7 @@
@Override
public Result deptVideoAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
- Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 1);
+ Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 1);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -496,10 +741,11 @@
MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
List<Integer> status = Arrays.asList(1, 0, -1);
List<String> resultCount = status.stream().map(item -> {
- Document filter = new Document("$and", Arrays.asList(
- new Document("deptTag", new Document("$eq", Boolean.TRUE)),
- new Document("recordStatus", item)
- ));
+ List<Document> dList = new ArrayList<>(4);
+ dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+ dList.add(new Document("recordStatus", new Document("$eq", item)));
+ setTag(params, dList);
+ Document filter = new Document("$and", dList);
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
new Document("$match", filter),
@@ -520,6 +766,7 @@
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getMinistryVideoAvailable)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -528,7 +775,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- resultCount.add(onlineRate + "%");
+ resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
map.put("list", resultList);
@@ -544,7 +791,7 @@
@Override
public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
- Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 3);
+ Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 3);
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
@@ -555,10 +802,11 @@
MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
List<Integer> status = Arrays.asList(1, 0, -1);
List<String> resultCount = status.stream().map(item -> {
- Document filter = new Document("$and", Arrays.asList(
- new Document("importantTag", new Document("$eq", Boolean.TRUE)),
- new Document("recordStatus", item)
- ));
+ List<Document> dList = new ArrayList<>(4);
+ dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+ dList.add(new Document("recordStatus", new Document("$eq", item)));
+ setTag(params, dList);
+ Document filter = new Document("$and", dList);
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
new Document("$match", filter),
@@ -573,12 +821,13 @@
uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
}
- return uniqueDeviceIdCount + "%";
+ return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeyVideoAvailable)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -587,7 +836,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- resultCount.add(onlineRate + "%");
+ resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
map.put("list", resultList);
@@ -628,7 +877,7 @@
@Override
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
- Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
+ Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
@@ -638,11 +887,26 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("osd_check_result");
- Document importantTag = new Document("importantTag", Boolean.TRUE);
- Document osdNameFilter = new Document("$and", Arrays.asList(new Document("osdNameCorrect", 1), importantTag));
- Document osdNameErrFilter = new Document("$and", Arrays.asList(new Document("osdNameCorrect", -1), importantTag));
- Document osdTimeFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", 1), importantTag));
- Document osdTimeErrFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", -1), importantTag));
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("importantTag", Boolean.TRUE));
+ dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("importantTag", Boolean.TRUE));
+ dList2.add(new Document("osdNameCorrect", new Document("$eq", -1)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("importantTag", Boolean.TRUE));
+ dList3.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("importantTag", Boolean.TRUE));
+ dList4.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+ setTag(params, dList4);
+ Document osdNameFilter = new Document("$and", dList1);
+ Document osdNameErrFilter = new Document("$and", dList2);
+ Document osdTimeFilter = new Document("$and", dList3);
+ Document osdTimeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(osdNameFilter, osdNameErrFilter, osdTimeFilter, osdTimeErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
@@ -665,6 +929,7 @@
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeyAnnotationAccuracy)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -673,7 +938,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -716,7 +981,7 @@
public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
- Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3);
+ Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
@@ -726,9 +991,16 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("osd_check_result");
- Document importantTag = new Document("importantTag", Boolean.TRUE);
- Document osdTimeFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", 1), importantTag));
- Document osdTimeErrFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", -1), importantTag));
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("importantTag", Boolean.TRUE));
+ dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("importantTag", Boolean.TRUE));
+ dList2.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+ setTag(params, dList2);
+ Document osdTimeFilter = new Document("$and", dList1);
+ Document osdTimeErrFilter = new Document("$and", dList2);
List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
@@ -751,6 +1023,7 @@
Date now = new Date();
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeyTimingAccuracy)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -759,7 +1032,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -786,10 +1059,26 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
- Document normalFilter = new Document("resultType", 1);
- Document noDataFilter = new Document("resultType", 2);
- Document trFilter = new Document("resultType", 3);
- Document littleFilter = new Document("resultType", 4);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("importantTag", Boolean.TRUE));
+ dList1.add(new Document("resultType", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("importantTag", Boolean.TRUE));
+ dList2.add(new Document("resultType", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("importantTag", Boolean.TRUE));
+ dList3.add(new Document("resultType", new Document("$eq", 3)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("importantTag", Boolean.TRUE));
+ dList4.add(new Document("resultType", new Document("$eq", 4)));
+ setTag(params, dList4);
+ Document normalFilter = new Document("$and", dList1);
+ Document noDataFilter = new Document("$and", dList2);
+ Document trFilter = new Document("$and", dList3);
+ Document littleFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
@@ -812,6 +1101,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getViewConnectStability)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -820,7 +1110,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -835,22 +1125,80 @@
*/
@Override
public Result vehiclePointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
- long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+ //鏌ヨ溅杈嗚澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ if(params.getOption()!=null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
+ }
+ // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+ query.with(Sort.by(Sort.Order.asc("pingOnline")));
+ //鍒嗛〉鏁伴噺
+ long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
- List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
+ //绯荤粺ping鐨勭粨鏋�
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ params.setDeptTag(-1);
+ params.setDeviceType(2);
+ resultList.forEach(item -> {
+ if(item.getPingOnline() ==null){
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else if(!item.getPingOnline()){
+ item.setPingOnlineStr("绂荤嚎");
+ }
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
+ });
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
- long distinctCount = collection.distinct("externalIndexCode", String.class).into(new ArrayList<>()).size();
+ // 缁熻璁惧鏁伴噺
+ //鍗＄墖缁熻
+ int totalCount =0;
+ int onlineCount =0;
+ int offlineCount =0;
+ int unknownCount =0;
+ //鏋勫缓鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ // 娣诲姞鍥哄畾鏉′欢
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+ // 鏋勫缓match鎿嶄綔
+ MatchOperation match = Aggregation.match(
+ new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+ );
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+ // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+ for (Map<String, Object> result : results.getMappedResults()) {
+ offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+ unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ totalCount = offlineCount + unknownCount + onlineCount;
+ }
- Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getSiteOnline)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+ .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -859,7 +1207,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(distinctCount + "%", onlineRate + "%"));
+ map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -883,11 +1231,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
- Document ipErrFilter = new Document("ip.error", true);
- Document macdzErrFilter = new Document("macdz.error", true);
- Document latitudeErrFilter = new Document("latitude.error", true);
- Document longitudeErrFilter = new Document("longitude.error", true);
-
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
@@ -904,12 +1263,13 @@
uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
}
- return uniqueDeviceIdCount + "%";
+ return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getDeviceDirectoryConsistent)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -918,7 +1278,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -944,10 +1304,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_cross_detail");
- Document ipErrFilter = new Document("lalType", 1);
- Document macdzErrFilter = new Document("lalType", 2);
- Document latitudeErrFilter = new Document("lalType", 3);
- Document longitudeErrFilter = new Document("lalType", 4);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("lalType", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("lalType", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("lalType", new Document("$eq", 3)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("lalType", new Document("$eq", 4)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -971,6 +1343,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleInformationCollectionAccuracy)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -979,7 +1352,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1008,6 +1381,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleCaptureIntegrity)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1018,7 +1392,7 @@
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(onlineRate + "%"));
+ map.put("count", Arrays.asList(this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1041,6 +1415,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleCaptureAccuracy)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1050,7 +1425,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(onlineRate + "%"));
+ map.put("count", Arrays.asList(this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1075,9 +1450,18 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
- Document ipErrFilter = new Document("snapResult", 1);
- Document macdzErrFilter = new Document("snapResult", 2);
- Document longitudeErrFilter = new Document("snapResult", 4);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("snapResult", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("snapResult", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("snapResult", new Document("$eq", 4)));
+ setTag(params, dList3);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document longitudeErrFilter = new Document("$and", dList3);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -1101,6 +1485,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleTimingAccuracy)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1109,7 +1494,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1135,6 +1520,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleUploadTimeliness)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1144,7 +1530,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(onlineRate + "%"));
+ map.put("count", Arrays.asList(this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1168,6 +1554,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleUrlAvailability)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1177,7 +1564,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(onlineRate + "%"));
+ map.put("count", Arrays.asList(this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1201,6 +1588,7 @@
Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehiclePictureAvailability)
+ .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1210,7 +1598,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(onlineRate + "%"));
+ map.put("count", Arrays.asList(this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1234,10 +1622,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
- Document normalFilter = new Document("resultType", 1);
- Document noDataFilter = new Document("resultType", 2);
- Document trFilter = new Document("resultType", 3);
- Document littleFilter = new Document("resultType", 4);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("resultType", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("resultType", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("resultType", new Document("$eq", 3)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("resultType", new Document("$eq", 4)));
+ setTag(params, dList4);
+ Document normalFilter = new Document("$and", dList1);
+ Document noDataFilter = new Document("$and", dList2);
+ Document trFilter = new Document("$and", dList3);
+ Document littleFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
@@ -1260,6 +1660,7 @@
Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getViewConnectStability)
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1268,7 +1669,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1283,44 +1684,78 @@
*/
@Override
public Result facePointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
+ List<String> likeFileds = Arrays.asList("name", "no", "ip");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
- long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class);
+ //鏌ヤ汉鑴歌澶�
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
+ //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+ if(params.getOption()!=null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
+ }
+ // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+ query.with(Sort.by(Sort.Order.asc("pingOnline")));
+ //鍒嗛〉鏁伴噺
+ long total = mongoTemplate.count(query, TMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
- List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class);
-
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor");
-
- Document normalFilter = new Document("resultType", 1);
- Document noDataFilter = new Document("resultType", 2);
- Document trFilter = new Document("resultType", 3);
- Document littleFilter = new Document("resultType", 4);
- List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter);
- List<String> rList = lists.stream().map(filter -> {
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$externalIndexCode")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ resultList.forEach(item -> {
+ if(item.getPingOnline() ==null){
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else if(!item.getPingOnline()){
+ item.setPingOnlineStr("绂荤嚎");
}
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
+ });
+ params.setDeptTag(-1);
+ params.setDeviceType(3);
- Date now = new Date();
+// 缁熻璁惧鏁伴噺
+ //鍗＄墖缁熻
+ int totalCount =0;
+ int onlineCount =0;
+ int offlineCount =0;
+ int unknownCount =0;
+ //鏋勫缓鏉′欢
+ List<Criteria> criteriaList = new ArrayList<>();
+ // 娣诲姞鍥哄畾鏉′欢
+ criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
+ criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+ // 鏍规嵁dataType鍔ㄦ�佹坊鍔犳潯浠�
+ if (params.getDataType() == 1) {
+ criteriaList.add(Criteria.where("provinceTag").is(Boolean.TRUE));
+ } else if (params.getDataType() == 2) {
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ }
+ // 鏋勫缓match鎿嶄綔
+ MatchOperation match = Aggregation.match(
+ new Criteria().andOperator(criteriaList.toArray(new Criteria[0]))
+ );
+ GroupOperation group = Aggregation.group()
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Online)).then(1).otherwise(0)).as("onlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Offline)).then(1).otherwise(0)).as("offlineCount")
+ .sum(ConditionalOperators.when(Criteria.where("online").is(ApiConstants.UY_OnlineSite_Unknown)).then(1).otherwise(0)).as("unknownCount");
+ // 灏嗗尮閰嶉樁娈靛拰鍒嗙粍闃舵缁勫悎璧锋潵
+ Aggregation aggregation = Aggregation.newAggregation(match, group);
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
+ for (Map<String, Object> result : results.getMappedResults()) {
+ offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
+ unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ totalCount = offlineCount + unknownCount + onlineCount;
+ }
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getSiteOnline)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
+ .between(CheckIndexFace::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1328,9 +1763,9 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+
HashMap<String, Object> map = new HashMap<>();
- map.put("count", rList);
+ map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1354,11 +1789,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
- Document ipErrFilter = new Document("ip.error", true);
- Document macdzErrFilter = new Document("macdz.error", true);
- Document latitudeErrFilter = new Document("latitude.error", true);
- Document longitudeErrFilter = new Document("longitude.error", true);
-
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
@@ -1381,6 +1827,7 @@
Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getDeviceDirectoryConsistent)
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1389,7 +1836,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1415,11 +1862,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_cross_detail");
- Document ipErrFilter = new Document("lalType", 1);
- Document macdzErrFilter = new Document("lalType", 2);
- Document latitudeErrFilter = new Document("lalType", 3);
- Document longitudeErrFilter = new Document("lalType", 4);
-
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("lalType", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("lalType", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("lalType", new Document("$eq", 3)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("lalType", new Document("$eq", 4)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
@@ -1442,6 +1900,7 @@
Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFaceInformationCollectionAccuracy)
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1450,7 +1909,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1476,10 +1935,22 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_monitoring_detail");
- Document ipErrFilter = new Document("lalType", 1);
- Document macdzErrFilter = new Document("lalType", 2);
- Document latitudeErrFilter = new Document("lalType", 3);
- Document longitudeErrFilter = new Document("lalType", 4);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("lalType", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("lalType", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("lalType", new Document("$eq", 3)));
+ setTag(params, dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("lalType", new Document("$eq", 4)));
+ setTag(params, dList4);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document latitudeErrFilter = new Document("$and", dList3);
+ Document longitudeErrFilter = new Document("$and", dList4);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -1503,6 +1974,7 @@
Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFacePictureQualification)
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1511,7 +1983,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1537,9 +2009,18 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
- Document ipErrFilter = new Document("snapResult", 1);
- Document macdzErrFilter = new Document("snapResult", 2);
- Document longitudeErrFilter = new Document("snapResult", 4);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("snapResult", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("snapResult", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("snapResult", new Document("$eq", 4)));
+ setTag(params, dList3);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document longitudeErrFilter = new Document("$and", dList3);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -1563,6 +2044,7 @@
Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFaceTimingAccuracy)
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1571,7 +2053,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1597,9 +2079,18 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
- Document ipErrFilter = new Document("snapResult", 1);
- Document macdzErrFilter = new Document("snapResult", 2);
- Document longitudeErrFilter = new Document("snapResult", 4);
+ List<Document> dList1 = new ArrayList<>(2);
+ dList1.add(new Document("snapResult", new Document("$eq", 1)));
+ setTag(params, dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("snapResult", new Document("$eq", 2)));
+ setTag(params, dList2);
+ List<Document> dList3 = new ArrayList<>(2);
+ dList3.add(new Document("snapResult", new Document("$eq", 4)));
+ setTag(params, dList3);
+ Document ipErrFilter = new Document("$and", dList1);
+ Document macdzErrFilter = new Document("$and", dList2);
+ Document longitudeErrFilter = new Document("$and", dList3);
List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
List<String> rList = lists.stream().map(filter -> {
@@ -1623,6 +2114,7 @@
Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFaceUploadTimeliness)
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1631,7 +2123,7 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(onlineRate + "%");
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
@@ -1657,6 +2149,7 @@
Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFacePictureAvailability)
+ .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
.between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1665,11 +2158,13 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(onlineRate + "%"));
+ map.put("count", Arrays.asList(this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
+
/**
* 瑙嗛锛氳棰戝浘鍍忚祫婧愬畨鍏ㄧ鐞�
*
@@ -1688,4 +2183,29 @@
return Result.ok().data(map).total(page.getTotal());
}
+
+ /**
+ * 鍒犻櫎灏鹃儴鐨�0
+ *
+ * @param rate
+ * @return
+ */
+ private String remove0(BigDecimal rate) {
+ DF.setDecimalSeparatorAlwaysShown(false);
+ return DF.format(rate) + "%";
+ }
+
+ /**
+ * 璁剧疆鏍囩鎼滅储鏉′欢
+ *
+ * @param params
+ * @param dList
+ */
+ private void setTag(DataCenterQuery params, List<Document> dList) {
+ if (params.getDataType().equals(1)) {
+ dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE)));
+ } else if (params.getDataType().equals(2)) {
+ dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+ }
+ }
}
--
Gitblit v1.8.0