From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 2621 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 1,721 insertions(+), 900 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 331ec29..68d86ac 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
@@ -6,6 +6,7 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.mongodb.client.AggregateIterable;
+import com.mongodb.client.DistinctIterable;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.ycl.platform.domain.entity.*;
@@ -35,17 +36,21 @@
import com.ycl.utils.bean.BeanUtils;
import com.ycl.utils.poi.ExcelUtil;
import constant.*;
+import enumeration.DataCenterMethodNameEnum;
import enumeration.general.AreaDeptEnum;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.bson.Document;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
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.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -54,6 +59,9 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -75,7 +83,9 @@
private final ICheckIndexFaceService checkIndexFaceService;
private final DynamicColumnMapper dynamicColumnMapper;
-
+ @Qualifier("threadPoolTaskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
private final static String TIME_FIELD = "mongoCreateTime";
@@ -690,155 +700,439 @@
}
-
-
/**
- * 瑙嗛锛氱偣浣嶅湪绾跨巼
- *
- * @param params
- * @return
+ * 鍐呴儴绫伙細瀛樺偍缁熻缁撴灉锛堥伩鍏嶉浂鏁ｅ彉閲忎紶閫掞級
*/
- @Override
- public Result videoPointOnlineRate(DataCenterQuery params) {
- List<String> likeFileds = Arrays.asList("name", "no", "ip");
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- Query query = null;
- SysDept sysDept = getSysDeptByLoginUser();
- AreaDeptEnum areaDeptEnum = null;
- if (sysDept !=null){
- areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
- if (areaDeptEnum != null){
- query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+ private static class StatisticsResult {
+ int totalCount;
+ int onlineCount;
+ int offlineCount;
+ int unknownCount;
+ BigDecimal onlineRate;
- }else{
- query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
- }
- }else {
- query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ public StatisticsResult(int totalCount, int onlineCount, int offlineCount, int unknownCount, BigDecimal onlineRate) {
+ this.totalCount = totalCount;
+ this.onlineCount = onlineCount;
+ this.offlineCount = offlineCount;
+ this.unknownCount = unknownCount;
+ this.onlineRate = onlineRate;
}
- //鏌ヨ棰戣澶�
- query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
- //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if (params.getOption() != null) {
- query.addCriteria(Criteria.where("online").is(params.getOption()));
- }
- Sort sort = Sort.by(
- Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
- Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
- );
- // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
- query.with(sort);
- //鍒嗛〉鏁伴噺
- 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("鏈煡");
- }
- List<String> offLineTime = item.getOffLineTimeStr();
- if (!CollectionUtils.isEmpty(offLineTime)) {
- if (offLineTime.size() > 1) {
- offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size());
+ }
+ /**
+ * 鍒楄〃鏁版嵁鏍煎紡鍖�
+ */
+ private void formatResultList(List<TMonitorResult> resultList,String tag) {
+ if(DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+ resultList.forEach(item -> {
+ // pingOnline 鐘舵�佽浆鎹�
+ if (item.getPingOnline() == null) {
+ item.setPingOnlineStr("鏈煡");
+ } else if (item.getPingOnline()) {
+ item.setPingOnlineStr("鍦ㄧ嚎");
+ } else {
+ item.setPingOnlineStr("绂荤嚎");
}
- item.setOffLineTimeStr(offLineTime);
- }
- //娣诲姞鍔ㄦ�佹暟鎹�
- List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
- item.setDynamicColumnList(list);
- });
+ // online 鐘舵�佽浆鎹�
+ if (1 == item.getOnline()) {
+ item.setOnlineStr("鍦ㄧ嚎");
+ } else if (-1 == item.getOnline()) {
+ item.setOnlineStr("绂荤嚎");
+ } else {
+ item.setOnlineStr("鏈煡");
+ }
- params.setDeptTag(-1);
- params.setDeviceType(1);
+ // 绂荤嚎鏃堕棿鎴柇锛堜繚鐣欐渶鍚�2鏉★級
+ List<String> offLineTime = item.getOffLineTimeStr();
+ if (!CollectionUtils.isEmpty(offLineTime) && offLineTime.size() > 1) {
+ item.setOffLineTimeStr(offLineTime.subList(offLineTime.size() - 2, offLineTime.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_Video + ".*"));
- criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- if (areaDeptEnum != null){
- criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+ // 娣诲姞鍔ㄦ�佸垪鏁版嵁
+ List<DynamicColumnVO> dynamicColumns = dynamicColumnMapper.getDynamicColumnByTable(
+ TableNameConstants.COLUMN_NAME_VIDEO_POINT,
+ item.getNo()
+ );
+ item.setDynamicColumnList(dynamicColumns);
+ });
}
- // 鏍规嵁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));
+ else if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)
+ || DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name().equals(tag)){
+ 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("鏈煡");
+ }
+ });
}
- // 鏋勫缓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;
- }
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (totalCount!=0) {
- onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
-// /** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getSiteOnline)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-// .list();
-//
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
-// 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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
+
}
/**
- * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼
+ * 鍗＄墖缁熻璁＄畻
+ */
+ private StatisticsResult calculateStatistics(DataCenterQuery params, AreaDeptEnum areaDeptEnum,String tag) {
+ int totalCount = 0, onlineCount = 0, offlineCount = 0, unknownCount = 0;
+
+ // 璁＄畻鍦ㄧ嚎鐜�
+ BigDecimal onlineRate = BigDecimal.ZERO;
+ if (DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+ // 鏋勫缓缁熻鏉′欢
+ 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()));
+
+ // 鏉冮檺杩囨护
+ if (areaDeptEnum != null) {
+ criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+ }
+ // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+ 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));
+ }
+
+ // MongoDB 鑱氬悎鏌ヨ
+ 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()) {
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+ totalCount = onlineCount + offlineCount + unknownCount;
+ }
+
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(onlineCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+ }
+ else if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)) {
+ // 鏋勫缓缁熻鏉′欢
+ 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()));
+ //閮ㄧ骇瑙嗛鏍囩 宸紓鐐�
+ criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+ // 鏉冮檺杩囨护
+ if (areaDeptEnum != null) {
+ criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+ }
+ // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+ 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));
+ }
+
+ // MongoDB 鑱氬悎鏌ヨ
+ 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()) {
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+ totalCount = onlineCount + offlineCount + unknownCount;
+ }
+
+
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(onlineCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+
+ }
+ else if (DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name().equals(tag)){
+ // 鏋勫缓缁熻鏉′欢
+ 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()));
+ criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
+
+ // 鏉冮檺杩囨护
+ if (areaDeptEnum != null) {
+ criteriaList.add(Criteria.where("no").regex("^" + areaDeptEnum.getCode()));
+ }
+ // 鏁版嵁绫诲瀷杩囨护锛堢渷/閮ㄩ棬鏍囩锛�
+ 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));
+ }
+
+ // MongoDB 鑱氬悎鏌ヨ
+ 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()) {
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0);
+ totalCount = onlineCount + offlineCount + unknownCount;
+ }
+
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(onlineCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+ }
+
+ return new StatisticsResult(totalCount, onlineCount, offlineCount, unknownCount, onlineRate);
+ }
+
+ /**
+ * 瑙嗛锛氱偣浣嶅湪绾跨巼浼樺寲绾跨▼
*
* @param params
* @return
*/
@Override
- public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+ public Result videoPointOnlineRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("name", "no", "ip");
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- Query query = null;
+ final Query query;
SysDept sysDept = getSysDeptByLoginUser();
- AreaDeptEnum areaDeptEnum = null;
+ final AreaDeptEnum areaDeptEnum; // 澹版槑涓篺inal
+
+ if (sysDept != null) {
+
+ areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+ if (areaDeptEnum != null) {
+ query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(), params, TIME_FIELD, likeFileds, null, "no");
+ } else {
+ query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ }
+ } else {
+ //闇�瑕佸垵濮嬪寲 涓嶇劧涓嬫柟寮曞叆 澶氱嚎绋嬩細鎶ユ湭鍒濆鍖�
+ areaDeptEnum = null;
+ query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ }
+
+
+ query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+ if (params.getOption() != null) {
+ query.addCriteria(Criteria.where("online").is(params.getOption()));
+ }
+
+ Sort sort = Sort.by(
+ Sort.Order.asc("pingOnline"),
+ Sort.Order.desc("offLineCount")
+ );
+ query.with(sort);
+
+ long total = mongoTemplate.count(query, TMonitorResult.class);
+ //杩愯鍒嗛〉鏌ヨ绾跨▼
+ CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(() -> {
+ try {
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ //鏋勫缓鍒楄〃鏁版嵁
+ formatResultList(resultList,DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name());
+ return resultList;
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鍒楄〃鏌ヨ澶辫触锛�" + e.getMessage(), e);
+ }
+ }, taskExecutor);
+ //杩愯缁熻绾跨▼
+ CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(() -> {
+ try {
+ return calculateStatistics(params, areaDeptEnum,DataCenterMethodNameEnum.VIDEO_POINT_ONLINE_RATE.name()); // 鐜板湪鍙畨鍏ㄥ紩鐢�
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
+ }
+ }, taskExecutor);
+
+ try {
+ CompletableFuture.allOf(listFuture, statsFuture).join();
+ List<TMonitorResult> resultList = listFuture.get();
+ StatisticsResult statsResult = statsFuture.get();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(
+ String.valueOf(statsResult.totalCount),
+ String.valueOf(statsResult.onlineCount),
+ String.valueOf(statsResult.offlineCount),
+ String.valueOf(statsResult.unknownCount),
+ this.remove0(statsResult.onlineRate)
+ ));
+ map.put("list", resultList);
+
+ return Result.ok().data(map).total(total);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+ } catch (ExecutionException e) {
+ Throwable rootCause = e.getCause();
+ String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+ return Result.error(errorMsg);
+ }
+ }
+
+// @Override
+// public Result videoPointOnlineRate(DataCenterQuery params) {
+// List<String> likeFileds = Arrays.asList("name", "no", "ip");
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// Query query = null;
+// SysDept sysDept = getSysDeptByLoginUser();
+// AreaDeptEnum areaDeptEnum = null;
+// if (sysDept !=null){
+// areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+// if (areaDeptEnum != null){
+// query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+// }else{
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// }else {
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+//
+// //鏌ヨ棰戣澶�
+// query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// //涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
+// if (params.getOption() != null) {
+// query.addCriteria(Criteria.where("online").is(params.getOption()));
+// }
+// Sort sort = Sort.by(
+// Sort.Order.asc("pingOnline"), // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+// Sort.Order.desc("offLineCount") // 棣栧厛鎸夌収 pingOnline 鍗囧簭鎺掑簭
+// );
+// // 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
+// query.with(sort);
+// //鍒嗛〉鏁伴噺
+// 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("鏈煡");
+// }
+// List<String> offLineTime = item.getOffLineTimeStr();
+// if (!CollectionUtils.isEmpty(offLineTime)) {
+// if (offLineTime.size() > 1) {
+// offLineTime = offLineTime.subList(offLineTime.size() - 2, offLineTime.size());
+// }
+// item.setOffLineTimeStr(offLineTime);
+// }
+// //娣诲姞鍔ㄦ�佹暟鎹�
+// List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO_POINT,item.getNo());
+// item.setDynamicColumnList(list);
+// });
+//
+//
+// params.setDeptTag(-1);
+// params.setDeviceType(1);
+//
+// //鍗＄墖缁熻
+// 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()));
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// if (areaDeptEnum != null){
+// criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+// }
+// // 鏍规嵁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;
+// }
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (totalCount!=0) {
+// onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// HashMap<String, Object> map = new HashMap<>();
+// map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+// map.put("list", resultList);
+// return Result.ok().data(map).total(total);
+// }
+ /**
+ * 瑙嗛锛氶儴绾х偣浣嶅湪绾跨巼浼樺寲绾跨▼
+ *
+ * @param params
+ * @return
+ */
+ @Override
+ public Result deptVideoPointOnlineRate(DataCenterQuery params){
+ List<String> likeFileds =Arrays.asList("name","no","ip");
+ final Query query;
+ SysDept sysDept = getSysDeptByLoginUser();
+ final AreaDeptEnum areaDeptEnum;
if (sysDept !=null){
areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
if (areaDeptEnum != null){
@@ -848,9 +1142,9 @@
query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
}
}else {
+ areaDeptEnum = null;
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));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
@@ -861,88 +1155,258 @@
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("绂荤嚎");
+
+ CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(() ->{
+ MongoUtil.setPage(query,params,TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ formatResultList(resultList,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name());
+ return resultList;
+ },taskExecutor);
+
+ CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(()->{
+ try {
+ return calculateStatistics(params, areaDeptEnum,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name()); // 鐜板湪鍙畨鍏ㄥ紩鐢�
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
}
- 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<>();
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- if (areaDeptEnum != null){
- criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+ },taskExecutor);
+
+ try {
+ CompletableFuture.allOf(listFuture, statsFuture).join();
+ List<TMonitorResult> resultList = listFuture.get();
+ StatisticsResult statsResult = statsFuture.get();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(
+ String.valueOf(statsResult.totalCount),
+ String.valueOf(statsResult.onlineCount),
+ String.valueOf(statsResult.offlineCount),
+ String.valueOf(statsResult.unknownCount),
+ this.remove0(statsResult.onlineRate)
+ ));
+ map.put("list", resultList);
+
+ return Result.ok().data(map).total(total);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+ } catch (ExecutionException e) {
+ Throwable rootCause = e.getCause();
+ String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+ return Result.error(errorMsg);
}
- // 娣诲姞鍥哄畾鏉′欢
- criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
- criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
- criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
- // 鏍规嵁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;
- }
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (totalCount!=0) {
- onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
-// params.setDeptTag(1);
-// params.setDeviceType(1);
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getMinistrySiteOnline)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
-// 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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
}
+// @Override
+// public Result deptVideoPointOnlineRate(DataCenterQuery params) {
+// List<String> likeFileds = Arrays.asList("name", "no", "ip");
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// Query query = null;
+// SysDept sysDept = getSysDeptByLoginUser();
+// AreaDeptEnum areaDeptEnum = null;
+// if (sysDept !=null){
+// areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+// if (areaDeptEnum != null){
+// query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+// }else{
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// }else {
+// 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()));
+// }
+// // 閫氳繃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<>();
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// if (areaDeptEnum != null){
+// criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+// }
+// // 娣诲姞鍥哄畾鏉′欢
+// criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+// criteriaList.add(Criteria.where("deptTag").is(Boolean.TRUE));
+// // 鏍规嵁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;
+// }
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (totalCount!=0) {
+// onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+//// params.setDeptTag(1);
+//// params.setDeviceType(1);
+//// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+//// .select(CheckIndexVideo::getMinistrySiteOnline)
+//// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+//// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+//// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+//// .list();
+//// BigDecimal onlineRate = BigDecimal.ZERO;
+//// if (CollectionUtils.isNotEmpty(videoList)) {
+//// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
+//// 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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+// map.put("list", resultList);
+// return Result.ok().data(map).total(total);
+// }
+
+// @Override
+// public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+// List<String> likeFileds = Arrays.asList("name", "no", "ip");
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// Query query = null;
+// SysDept sysDept = getSysDeptByLoginUser();
+// AreaDeptEnum areaDeptEnum = null;
+// if (sysDept !=null){
+// areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
+// if (areaDeptEnum != null){
+// query = MongoUtil.getQueryDataCenter(areaDeptEnum.getCode(),params,TIME_FIELD,likeFileds,null,"no");
+//
+// }else{
+// query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+// }
+// }else {
+// 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("鏈煡");
+// }
+// });
+//
+// // 缁熻璁惧鏁伴噺
+// //鍗＄墖缁熻
+// int totalCount = 0;
+// int onlineCount = 0;
+// int offlineCount = 0;
+// int unknownCount = 0;
+// //鏋勫缓鏉′欢
+// List<Criteria> criteriaList = new ArrayList<>();
+// //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
+// if (areaDeptEnum != null){
+// criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+// }
+// // 娣诲姞鍥哄畾鏉′欢
+// criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
+// criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
+// criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
+// // 鏍规嵁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;
+// }
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (totalCount!=0) {
+// onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// HashMap<String, Object> map = new HashMap<>();
+// map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
+// map.put("list", resultList);
+// return Result.ok().data(map).total(total);
+// }
/**
* 瑙嗛锛氶噸鐐圭偣浣嶅湪绾跨巼
*
@@ -950,12 +1414,12 @@
* @return
*/
@Override
- public Result videoImportantPointOnlineRate(DataCenterQuery params) {
+ public Result videoImportantPointOnlineRate(DataCenterQuery params){
List<String> likeFileds = Arrays.asList("name", "no", "ip");
//姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- Query query = null;
+ final Query query;
SysDept sysDept = getSysDeptByLoginUser();
- AreaDeptEnum areaDeptEnum = null;
+ final AreaDeptEnum areaDeptEnum;
if (sysDept !=null){
areaDeptEnum = AreaDeptEnum.fromDept(Math.toIntExact(sysDept.getDeptId()));
if (areaDeptEnum != null){
@@ -965,6 +1429,7 @@
query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
}
}else {
+ areaDeptEnum = null;
query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
}
//鏌ヨ棰戣澶�
@@ -976,89 +1441,53 @@
}
// 閫氳繃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("鏈煡");
- }
- });
- // 缁熻璁惧鏁伴噺
- //鍗＄墖缁熻
- int totalCount = 0;
- int onlineCount = 0;
- int offlineCount = 0;
- int unknownCount = 0;
- //鏋勫缓鏉′欢
- List<Criteria> criteriaList = new ArrayList<>();
- //姝ゅ鏂板浜嗘牴鎹敤鎴锋潈闄愭煡璇㈢殑鎯呭喌
- if (areaDeptEnum != null){
- criteriaList.add(Criteria.where("no").regex("^" +areaDeptEnum.getCode()));
+ CompletableFuture<List<TMonitorResult>> listFuture = CompletableFuture.supplyAsync(()->{
+ try {
+ MongoUtil.setPage(query, params, TIME_FIELD);
+ List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
+ //鏋勫缓鍒楄〃鏁版嵁
+ formatResultList(resultList,DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name());
+
+ return resultList;
+ } catch (Exception e) {
+ throw new CompletionException("瑙嗛璁惧鍒楄〃鏌ヨ澶辫触锛�" + e.getMessage(), e);
+ }
+ },taskExecutor);
+
+ CompletableFuture<StatisticsResult> statsFuture = CompletableFuture.supplyAsync(()->{
+ try {
+ return calculateStatistics(params, areaDeptEnum, DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_ONLINE_RATE.name());
+ }catch (Exception e){
+ throw new CompletionException("瑙嗛璁惧鐘舵�佺粺璁″け璐ワ細" + e.getMessage(), e);
+ }
+ },taskExecutor);
+ try {
+ CompletableFuture.allOf(listFuture, statsFuture).join();
+ List<TMonitorResult> resultList = listFuture.get();
+ StatisticsResult statsResult = statsFuture.get();
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", Arrays.asList(
+ String.valueOf(statsResult.totalCount),
+ String.valueOf(statsResult.onlineCount),
+ String.valueOf(statsResult.offlineCount),
+ String.valueOf(statsResult.unknownCount),
+ this.remove0(statsResult.onlineRate)
+ ));
+ map.put("list", resultList);
+
+ return Result.ok().data(map).total(total);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return Result.error("鏌ヨ琚腑鏂紝璇风◢鍚庨噸璇�");
+ } catch (ExecutionException e) {
+ Throwable rootCause = e.getCause();
+ String errorMsg = rootCause != null ? rootCause.getMessage() : "瑙嗛璁惧鏁版嵁鏌ヨ澶辫触";
+ return Result.error(errorMsg);
}
- // 娣诲姞鍥哄畾鏉′欢
- criteriaList.add(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
- criteriaList.add(Criteria.where("mongoCreateTime").gte(params.getStartTime()).lte(params.getEndTime()));
- criteriaList.add(Criteria.where("importantTag").is(Boolean.TRUE));
- // 鏍规嵁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;
- }
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (totalCount!=0) {
- onlineRate = new BigDecimal(onlineCount).divide(new BigDecimal(totalCount), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getKeySiteOnline)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add);
-// 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(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
+
}
/**
@@ -1295,6 +1724,7 @@
*/
@Override
public Result videoOneMachineDocumentQualified(DataCenterQuery params) {
+ long startTime = System.currentTimeMillis();
List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
SysDept sysDept = getSysDeptByLoginUser();
List<Criteria> andCriteria;
@@ -1353,111 +1783,131 @@
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
+
List<MonitorQualifyResultVO> resultVOS = new ArrayList<>();
for (MonitorQualifyResult result : resultList) {
MonitorQualifyResultVO vo = MonitorQualifyResult.getVO(result);
resultVOS.add(vo);
}
- // 缁熻鏁伴噺
+ long endTime = System.currentTimeMillis();
+ // 缁熻鏁伴噺锛堟敼閫犲悗锛氫竴娆¤仛鍚堣繑鍥炴墍鏈夌粨鏋滐級
+ long startTime2 = System.currentTimeMillis();
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
- Document areDocument = null;
+
+// 1. 鏋勫缓鍏叡杩囨护鏉′欢锛坉eviceNo鍓嶇紑 + tag杩囨护锛�
+ List<Document> commonFilters = new ArrayList<>(2);
if (areaDeptEnum != null) {
String areaCodePrefix = areaDeptEnum.getCode();
- areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+ commonFilters.add(new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix)));
}
- //鎬绘暟
- List<Document> dList1 = new ArrayList<>(2);
- if (areDocument != null){
- dList1.add(areDocument);
- }
- setTag(params, dList1);
- Document totalFilter = new Document("$and", dList1);
- //list1
+ setTag(params, commonFilters); // 娣诲姞tag杩囨护鏉′欢
+ Document commonFilter = commonFilters.isEmpty() ? new Document() : new Document("$and", commonFilters);
- //鍚堟牸鏁�
- List<Document> dList2 = new ArrayList<>(2);
- if (areDocument != null){
- dList2.add(areDocument);
- }
- dList2.add(new Document("serialNumber.error", Boolean.FALSE));
- dList2.add(new Document("name.error", Boolean.FALSE));
- dList2.add(new Document("civilCode.error", Boolean.FALSE));
- dList2.add(new Document("integrated_device.error", Boolean.FALSE));
- dList2.add(new Document("jkdwlx.error", Boolean.FALSE));
- dList2.add(new Document("latitude.error", Boolean.FALSE));
- dList2.add(new Document("longitude.error", Boolean.FALSE));
- dList2.add(new Document("macdz.error", Boolean.FALSE));
- dList2.add(new Document("name.error", Boolean.FALSE));
- dList2.add(new Document("sbzt.error", Boolean.FALSE));
- dList2.add(new Document("sxjcjqy.error", Boolean.FALSE));
- dList2.add(new Document("sxjgnlx.error", Boolean.FALSE));
- setTag(params, dList2);
- Document qualifyFilter = new Document("$and", dList2);
- //涓嶅悎鏍兼暟
- List<Document> dList3 = new ArrayList<>(2);
- if (areDocument != null){
- dList3.add(areDocument);
- }
- setTag(params, dList3);
- List<Document> errorConditions = new ArrayList<>();
- errorConditions.add(new Document("serialNumber.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("name.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("civilCode.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("integrated_device.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("jkdwlx.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("name.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("sbzt.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("sxjcjqy.error", new Document("$eq", Boolean.TRUE)));
- errorConditions.add(new Document("sxjgnlx.error", new Document("$eq", Boolean.TRUE)));
- Document errorFilter = new Document("$or", errorConditions);
- dList3.add(errorFilter);
- Document unQualifyFilter = new Document("$and", dList3);
+// 2. 鏋勫缓鍚堟牸/涓嶅悎鏍肩殑error鏉′欢锛堝鐢ㄥ師閫昏緫锛屽幓閲峮ame.error锛�
+// 鍚堟牸鏉′欢锛氭墍鏈塭rror涓篺alse
+ List<Document> qualifyErrorConditions = new ArrayList<>();
+ qualifyErrorConditions.add(new Document("serialNumber.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("name.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("civilCode.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("integrated_device.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("jkdwlx.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("latitude.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("longitude.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("macdz.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("sbzt.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("sxjcjqy.error", Boolean.FALSE));
+ qualifyErrorConditions.add(new Document("sxjgnlx.error", Boolean.FALSE));
+ Document qualifyFilter = new Document("$and", qualifyErrorConditions);
- List<Document> lists = Arrays.asList(totalFilter, qualifyFilter, unQualifyFilter);
- List<String> rList = lists.stream().map(filter -> {
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$serialNumber.showValue")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
+// 涓嶅悎鏍兼潯浠讹細鑷冲皯涓�涓猠rror涓簍rue
+ List<Document> unQualifyErrorConditions = new ArrayList<>();
+ unQualifyErrorConditions.add(new Document("serialNumber.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("name.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("civilCode.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("integrated_device.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("jkdwlx.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("latitude.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("longitude.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("macdz.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("sbzt.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("sxjcjqy.error", Boolean.TRUE));
+ unQualifyErrorConditions.add(new Document("sxjgnlx.error", Boolean.TRUE));
+ Document unQualifyFilter = new Document("$or", unQualifyErrorConditions);
+
+// 3. 鏋勫缓涓�娆¤仛鍚堢閬擄紙鐢�$facet鍚堝苟涓変釜缁熻缁村害锛�
+ List<Document> pipeline = new ArrayList<>();
+
+// 姝ラ1锛氬厛搴旂敤鍏叡杩囨护鏉′欢锛坉eviceNo + tag锛夛紝鍑忓皯鍚庣画澶勭悊鏁版嵁閲�
+ if (!commonFilters.isEmpty()) {
+ pipeline.add(new Document("$match", commonFilter));
+ }
+
+// 姝ラ2锛氱敤$facet鍒嗛潰鏌ヨ锛屽悓鏃惰绠楁�绘暟銆佸悎鏍兼暟銆佷笉鍚堟牸鏁�
+ pipeline.add(new Document("$facet", new Document()
+ // 鎬绘暟锛氭寜serialNumber.showValue鍘婚噸鍚庤鏁�
+ .append("total", Arrays.asList(
+ new Document("$group", new Document("_id", "$serialNumber.showValue")),
+ new Document("$count", "uniqueDeviceIds")
+ ))
+ // 鍚堟牸鏁帮細鍏堣繃婊ゅ悎鏍兼潯浠讹紝鍐嶅幓閲嶈鏁�
+ .append("qualify", Arrays.asList(
+ new Document("$match", qualifyFilter),
+ new Document("$group", new Document("_id", "$serialNumber.showValue")),
+ new Document("$count", "uniqueDeviceIds")
+ ))
+ // 涓嶅悎鏍兼暟锛氬厛杩囨护涓嶅悎鏍兼潯浠讹紝鍐嶅幓閲嶈鏁�
+ .append("unQualify", Arrays.asList(
+ new Document("$match", unQualifyFilter),
+ new Document("$group", new Document("_id", "$serialNumber.showValue")),
+ new Document("$count", "uniqueDeviceIds")
+ ))
+ ));
+// Document explainResult = collection.aggregate(pipeline).explain();
+//
+//// 鎵撳嵃鎵ц璁″垝锛堟棩蹇楁垨鎺у埗鍙拌緭鍑猴級
+// log.info("鑱氬悎鏌ヨ鎵ц璁″垝锛歿}", explainResult.toJson());
+// 4. 鎵ц鑱氬悎鏌ヨ锛堜粎涓�娆℃暟鎹簱浜や簰锛�
+ AggregateIterable<Document> facetResult = collection.aggregate(pipeline).allowDiskUse(true);
+ Document resultDoc = facetResult.iterator().next(); // $facet浠呰繑鍥炰竴涓枃妗�
+
+// 5. 瑙ｆ瀽缁撴灉锛堝鐞嗙┖缁撴灉鍦烘櫙锛岄粯璁よ鏁颁负0锛�
+ int totalCount = parseFacetCount(resultDoc, "total");
+ int qualifyCount = parseFacetCount(resultDoc, "qualify");
+ int unQualifyCount = parseFacetCount(resultDoc, "unQualify");
+
+// 6. 缁勮rList锛堜繚鎸佸師鏍煎紡涓嶅彉锛屽悗缁�昏緫鏃犻渶淇敼锛�
+ List<String> rList = new ArrayList<>(Arrays.asList(
+ String.valueOf(totalCount),
+ String.valueOf(qualifyCount),
+ String.valueOf(unQualifyCount)
+ ));
+// 鍘熷悎鏍肩巼璁＄畻閫昏緫涓嶅彉
BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
- onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(qualifyCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
}
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getMonitorQualification)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorQualification).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-// }
+ rList.add(this.remove0(onlineRate));
+
+ long endTime2 = System.currentTimeMillis();
+ log.info("缁熻鑰楁椂锛歿} ms", (endTime2 - startTime2));
+
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultVOS);
return Result.ok().data(map).total(total);
}
-
+ private int parseFacetCount(Document resultDoc, String facetName) {
+ List<Document> facetList = (List<Document>) resultDoc.get(facetName);
+ if (facetList == null || facetList.isEmpty()) {
+ return 0;
+ }
+ Document countDoc = facetList.get(0);
+ return countDoc.getInteger("uniqueDeviceIds", 0);
+ }
/**
* 瑙嗛锛氭。妗堣�冩牳姣�
* 妗ｆ鐣欏瓨鎬婚噺锛歮ongo瀛樼殑鎵�鏈夊幓閲嶅悗鐨勬。妗�
@@ -1469,6 +1919,7 @@
*/
@Override
public Result videoAssessmentFileRatio(DataCenterQuery params) {
+ long startTIme = System.currentTimeMillis();
List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue");
List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
Query query = new Query();
@@ -1476,6 +1927,7 @@
and.andOperator(andCriteria);
query = Query.query(and);
long total = mongoTemplate.count(query, MonitorQualifyResult.class);
+
MongoUtil.setPage(query, params, TIME_FIELD);
List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class);
List<MonitorQualifyResultVO> resultVOS = new ArrayList<>();
@@ -1483,43 +1935,45 @@
MonitorQualifyResultVO vo = MonitorQualifyResult.getVO(result);
resultVOS.add(vo);
}
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
- //鎬绘暟
- List<Document> dList1 = new ArrayList<>(2);
- DataCenterQuery totalParams = new DataCenterQuery();
- BeanUtils.copyProperties(params, totalParams);
- totalParams.setStartTime(null);
- setTag(totalParams, dList1);
- Document totalFilter = new Document("$and", dList1);
- //褰撴棩妗ｆ鏁�
- List<Document> dList2 = new ArrayList<>(2);
- setTag(params, dList2);
- Document newFilter = new Document("$and", dList2);
+ long endTime = System.currentTimeMillis();
+ log.info("鏌ヨ妗ｆ鑰冩牳姣斾娇鐢ㄦ椂闂达細{}ms",endTime-startTIme);
+// // 缁熻鏁伴噺
+// MongoDatabase database = mongoTemplate.getDb();
+// MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+// //鎬绘暟
+// List<Document> dList1 = new ArrayList<>(2);
+// DataCenterQuery totalParams = new DataCenterQuery();
+// BeanUtils.copyProperties(params, totalParams);
+// totalParams.setStartTime(null);
+// setTag(totalParams, dList1);
+// Document totalFilter = new Document("$and", dList1);
+// //褰撴棩妗ｆ鏁�
+// List<Document> dList2 = new ArrayList<>(2);
+// setTag(params, dList2);
+// Document newFilter = new Document("$and", dList2);
- List<Document> lists = Arrays.asList(totalFilter, newFilter);
- List<String> rList = lists.stream().map(filter -> {
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$serialNumber.showValue")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
- onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
+ List<String> rlist = this.buildVideoAssessmentFileRatioCount(params);
+// List<String> rList = lists.stream().map(filter -> {
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$serialNumber.showValue")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+// AggregateIterable<Document> result = collection.aggregate(pipeline);
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// return uniqueDeviceIdCount + "";
+// }).collect(Collectors.toList());
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+// onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
// .select(CheckIndexVideo::getArchivesRate)
// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
@@ -1532,12 +1986,121 @@
// BigDecimal count = BigDecimal.valueOf(videoList.size());
// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
// }
- rList.add(this.remove0(onlineRate));
+// rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", rList);
+ map.put("count", rlist);
map.put("list", resultVOS);
return Result.ok().data(map).total(total);
}
+ private List<String> buildVideoAssessmentFileRatioCount(DataCenterQuery params) {
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify");
+
+ // 1. 鏋勫缓鍩虹杩囨护鏉′欢锛堜緷璧杝etTag锛岃嚜鍔ㄥ鐞嗘爣绛�+鏃堕棿锛�
+ List<Document> baseFilterList = new ArrayList<>();
+ setTag(params, baseFilterList);
+
+ // 2. 鎬绘暟缁熻锛堟棤鏃堕棿闄愬埗锛�
+ List<Document> totalFilterList = new ArrayList<>(baseFilterList);
+ totalFilterList.removeIf(doc -> doc.containsKey(TIME_FIELD));
+ int totalCount = 0;
+
+ if (totalFilterList.isEmpty()) {
+ // 鍏ㄩ噺缁熻锛氱敤distinct杩唬璁℃暟锛堝吋瀹规墍鏈夐┍鍔級
+ totalCount = countDistinctUniqueDevices(collection);
+ } else {
+ // 鏉′欢缁熻锛氳仛鍚堢閬擄紙鏃燗ggregateOptions锛�
+ Document totalMatch = buildSafeMatchCondition(totalFilterList, "total");
+ totalCount = countUniqueDevices(collection, totalMatch);
+ }
+
+ // 3. 褰撴棩鏁扮粺璁★紙鏉′欢缁熻锛�
+ Document currentDayMatch = buildSafeMatchCondition(baseFilterList, "currentDay");
+ int currentDayCount = countUniqueDevices(collection, currentDayMatch);
+
+ // 4. 璁＄畻鍦ㄧ嚎鐜�
+ BigDecimal onlineRate = BigDecimal.ZERO;
+ if (totalCount != 0) {
+ onlineRate = new BigDecimal(currentDayCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+
+ List<String> rList = new ArrayList<>();
+ rList.add(String.valueOf(totalCount));
+ rList.add(String.valueOf(currentDayCount));
+ rList.add(this.remove0(onlineRate));
+ return rList;
+ }
+
+ private int countDistinctUniqueDevices(MongoCollection<Document> collection) {
+ long start = System.currentTimeMillis();
+ try {
+ // 鍘婚噸鑾峰彇璁惧ID锛堟寚瀹氱被鍨嬩负String锛�
+ DistinctIterable<String> deviceIds = collection.distinct(
+ "serialNumber.showValue",
+ String.class
+ );
+
+ // 鎵嬪姩杩唬璁℃暟锛堝吋瀹规墍鏈夐┍鍔ㄧ増鏈級
+ long count = 0;
+ for (String ignored : deviceIds) {
+ count++;
+ }
+
+ log.info("鍏ㄩ噺鍞竴璁惧鏁扮粺璁¤�楁椂锛歿}ms锛屾�绘暟锛歿}", System.currentTimeMillis() - start, count);
+ return (int) count;
+ } catch (Exception e) {
+ log.error("鍏ㄩ噺缁熻澶辫触", e);
+ return 0;
+ }
+ }
+
+ /**
+ * 甯︽潯浠剁粺璁★細鏃� AggregateOptions锛屼粎鍩虹鑱氬悎绠￠亾
+ */
+ private int countUniqueDevices(MongoCollection<Document> collection, Document match) {
+ long start = System.currentTimeMillis();
+ List<Document> pipeline = Arrays.asList(
+ match, // $match 鏉′欢锛堢‘淇濆寘鍚储寮曞瓧娈碉紝寮曞绱㈠紩鍛戒腑锛�
+ new Document("$sort", new Document("serialNumber.showValue", 1)), // 鍒╃敤绱㈠紩鎺掑簭
+ new Document("$group", new Document("_id", "$serialNumber.showValue")), // 鍘婚噸
+ new Document("$count", "uniqueDeviceIds") // 缁熻鏁伴噺
+ );
+
+ try {
+ // 鐩存帴鎵ц鑱氬悎锛屼笉浣跨敤 AggregateOptions
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ Document doc = result.first();
+ int count = doc != null ? doc.getInteger("uniqueDeviceIds", 0) : 0;
+ log.info("甯︽潯浠剁粺璁¤�楁椂锛歿}ms锛岀粨鏋滐細{}", System.currentTimeMillis() - start, count);
+ return count;
+ } catch (Exception e) {
+ log.error("甯︽潯浠剁粺璁″け璐ワ紝match锛歿}", match, e);
+ return 0;
+ }
+ }
+ /**
+ * 瀹夊叏鏋勫缓$match鏉′欢锛氬交搴曢伩鍏�$and绌烘暟缁勯敊璇�
+ */
+ private Document buildSafeMatchCondition(List<Document> filterList, String name) {
+ // 杩囨护null+鍘婚噸锛岀‘淇濇潯浠跺悎娉�
+ List<Document> validConditions = filterList.stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+
+ log.info("{}缁熻鏈夋晥鏉′欢锛歿}", name, validConditions);
+
+ if (validConditions.isEmpty()) {
+ return new Document("$match", new Document()); // 绌烘潯浠垛啋鍖归厤鎵�鏈�
+ } else if (validConditions.size() == 1) {
+ return new Document("$match", validConditions.get(0)); // 鍗曟潯浠垛啋鏃犻渶$and
+ } else {
+ return new Document("$match", new Document("$and", validConditions)); // 澶氭潯浠垛啋$and鍖呰９
+ }
+ }
+
private final ISysConfigService configService;
@@ -1601,104 +2164,222 @@
List<DynamicColumnVO> list = dynamicColumnMapper.getDynamicColumnByTable(TableNameConstants.COLUMN_NAME_VIDEO,item.getId());
item.setDynamicColumnList(list);
-
});
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
- List<Integer> status = Arrays.asList(1, 0, -1);
+// // 缁熻鏁伴噺
+// MongoDatabase database = mongoTemplate.getDb();
+// MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+//
+// List<Integer> status = Arrays.asList(1, 0, -1);
+// AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
+// List<String> resultCount = status.stream().map(item -> {
+// List<Document> dList = new ArrayList<>(2);
+//
+// dList.add(new Document("recordStatus", new Document("$eq", item)));
+// if(finalAreaDeptEnum != null){
+// dList.add(new Document("$and", Arrays.asList(
+// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
+// }else {
+// dList.add(new Document("no", new Document("$in", noString)));
+// }
+//
+// setTag(params, dList);
+// Document filter = new Document("$and", dList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// 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 鍙細浜х敓涓�涓粨鏋�
+// }
+// return uniqueDeviceIdCount + "";
+// }).collect(Collectors.toList());
+//
+// //璁＄畻褰曞儚鍙敤鐜�
+// MongoDatabase databaes2 = mongoTemplate.getDb();
+// MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum");
+//
+// double finalRecordingMinTime = getSySMinTime();
+//
+// List<Document> documentList = new ArrayList<>(2);
+// if(finalAreaDeptEnum != null){
+// documentList.add(new Document("$and", Arrays.asList(
+// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
+// }else {
+// documentList.add(new Document("no", new Document("$in", noString)));
+// }
+// // documentList.add(new Document("$and", Arrays.asList(
+// // new Document("no", new Document("$in", noString)),
+// // new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// // )));
+// setTag(params, documentList);
+// Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
+// documentList.add(recording);
+//
+// Document filter = new Document("$and", documentList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceId")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// AggregateIterable<Document> result = collection2.aggregate(pipeline);
+//
+//
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// log.error("褰曞儚鍙敤鐜囨墦鍗帮細{}",uniqueDeviceIdCount);
+// int totalCount = 0;
+// for (String s : resultCount) {
+// totalCount += Integer.parseInt(s);
+// }
+// resultCount.add(0, totalCount + "");
+//
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// // 1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
+// if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+// //resultCount.get(0)鏄�绘暟 uniqueDeviceIdCount鏄牴鎹郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟
+// onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// resultCount.add(this.remove0(onlineRate));
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.VIDEO_AVAILABILITY_RATE.name()));
+ map.put("list", resultList);
+ return Result.ok().data(map).total(total);
+ }
+ public List<String> buildCount(AreaDeptEnum areaDeptEnum,List<String> noString,DataCenterQuery params,String tag){
+ MongoDatabase databaes= mongoTemplate.getDb();
+ MongoCollection<Document> collection = databaes.getCollection("uy_record_meta_d_sum");
AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
- List<String> resultCount = status.stream().map(item -> {
- List<Document> dList = new ArrayList<>(2);
-
- dList.add(new Document("recordStatus", new Document("$eq", item)));
- if(finalAreaDeptEnum != null){
- dList.add(new Document("$and", Arrays.asList(
- new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }else {
- dList.add(new Document("no", new Document("$in", noString)));
- }
-
- setTag(params, dList);
- Document filter = new Document("$and", dList);
- // 鏋勫缓鑱氬悎绠￠亾
- 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 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- //璁＄畻褰曞儚鍙敤鐜�
- MongoDatabase databaes2 = mongoTemplate.getDb();
- MongoCollection<Document> collection2 = databaes2.getCollection("uy_record_meta_d_sum");
-
double finalRecordingMinTime = getSySMinTime();
+ // 2. 鏋勫缓鑱氬悎绠￠亾锛堟牳蹇冿細涓�娆＄閬撶粺璁℃墍鏈夋寚鏍囷級
+ List<Document> pipeline = new ArrayList<>();
- List<Document> documentList = new ArrayList<>(2);
- if(finalAreaDeptEnum != null){
- documentList.add(new Document("$and", Arrays.asList(
+ // 闃舵1锛�$match - 鍩虹杩囨护锛堝鐢ㄤ袱娆℃煡璇㈢殑鍏卞悓鏉′欢锛�
+ List<Document> baseFilterList = new ArrayList<>();
+ if (DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name().equals(tag)){
+ baseFilterList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
+ }
+ if (DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_AVAILABILITY_RATE.name().equals(tag)){
+ baseFilterList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+ }
+
+ // 鏉′欢1锛歯o鐨勮繃婊わ紙in + 鍙�夊墠缂�鍖归厤锛屽拰浣犲師浠ｇ爜閫昏緫涓�鑷达級
+ if (finalAreaDeptEnum != null) {
+ baseFilterList.add(new Document("$and", Arrays.asList(
new Document("no", new Document("$in", noString)),
new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
)));
- }else {
- documentList.add(new Document("no", new Document("$in", noString)));
+ } else {
+ baseFilterList.add(new Document("no", new Document("$in", noString)));
}
-// documentList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
-// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
-// )));
- setTag(params, documentList);
- Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
- documentList.add(recording);
-
- Document filter = new Document("$and", documentList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
+ setTag(params, baseFilterList);
+ Document matchStage = new Document("$match", new Document("$and", baseFilterList));
+ pipeline.add(matchStage);
+ // 闃舵2锛�$group - 鎸塪eviceId鍘婚噸锛屾爣璁板悇鏉′欢鏄惁婊¤冻
+ // --------------------------
+ // 閫昏緫锛氭瘡涓澶囧彧缁熻涓�娆★紝鐢�$cond鏍囪鈥滄槸鍚︾鍚堟煇鏉′欢鈥濓紙绗﹀悎=1锛屼笉绗﹀悎=0锛�
+ Document groupByDeviceStage = new Document("$group",
+ new Document("_id", "$deviceId") // 鎸夎澶嘔D鍒嗙粍锛堝幓閲嶆牳蹇冿級
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=1
+ .append("status1Flag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$eq", Arrays.asList("$recordStatus", 1)), // 鍒ゆ柇鏉′欢
+ 1, // 绗﹀悎锛氳1
+ 0 // 涓嶇鍚堬細璁�0
+ ))
+ ))
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=0
+ .append("status0Flag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$eq", Arrays.asList("$recordStatus", 0)),
+ 1,
+ 0
+ ))
+ ))
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 recordStatus=-1
+ .append("statusMinus1Flag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$eq", Arrays.asList("$recordStatus", -1)),
+ 1,
+ 0
+ ))
+ ))
+ // 鏍囪锛氳璁惧鏄惁婊¤冻 missDuration 鈮� finalRecordingMinTime锛堝師绗簩娈垫煡璇㈡潯浠讹級
+ .append("missOkFlag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$lte", Arrays.asList("$missDuration", finalRecordingMinTime)),
+ 1,
+ 0
+ ))
+ ))
);
- AggregateIterable<Document> result = collection2.aggregate(pipeline);
+ pipeline.add(groupByDeviceStage);
+ // --------------------------
+ // 闃舵3锛�$group - 鍏ㄥ眬缁熻锛堢疮鍔犳墍鏈夎澶囩殑鏍囪锛屽緱鍒版渶缁堟暟閲忥級
+ // --------------------------
+ // 閫昏緫锛氭棤鍒嗙粍閿紙_id: null锛夛紝灏嗘墍鏈夎澶囩殑鏍囪绱姞锛屽緱鍒版�昏鏁�
+ Document groupGlobalStage = new Document("$group",
+ new Document("_id", null) // 鍏ㄥ眬鍒嗙粍锛堢粺璁℃墍鏈夎澶囷級
+ // 鍘熺涓�娈垫煡璇㈢粨鏋�1锛歴tatus=1鐨勮澶囨暟
+ .append("status1Count", new Document("$sum", "$status1Flag"))
+ // 鍘熺涓�娈垫煡璇㈢粨鏋�2锛歴tatus=0鐨勮澶囨暟
+ .append("status0Count", new Document("$sum", "$status0Flag"))
+ // 鍘熺涓�娈垫煡璇㈢粨鏋�3锛歴tatus=-1鐨勮澶囨暟
+ .append("statusMinus1Count", new Document("$sum", "$statusMinus1Flag"))
+ // 鍘熺浜屾鏌ヨ缁撴灉锛歮issDuration绗﹀悎鏉′欢鐨勮澶囨暟
+ .append("missOkCount", new Document("$sum", "$missOkFlag"))
+ );
+ pipeline.add(groupGlobalStage);
-
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+ // --------------------------
+ // 鎵ц鑱氬悎鏌ヨ锛屾彁鍙栨墍鏈夌粺璁＄粨鏋�
+ // --------------------------
+ AggregateIterable<Document> aggregateResult = collection.aggregate(pipeline);
+ Document statDoc = null;
+ for (Document doc : aggregateResult) { // 鍏ㄥ眬鍒嗙粍鍙細杩斿洖1鏉＄粨鏋�
+ statDoc = doc;
+ break;
}
- log.error("褰曞儚鍙敤鐜囨墦鍗帮細{}",uniqueDeviceIdCount);
- int totalCount = 0;
- for (String s : resultCount) {
- totalCount += Integer.parseInt(s);
- }
- resultCount.add(0, totalCount + "");
+ // 鍒濆鍖栭粯璁ゅ�硷紙閬垮厤绌烘寚閽堬級
+ int status1Count = 0, status0Count = 0, statusMinus1Count = 0, missOkCount = 0;
+ if (statDoc != null) {
+ status1Count = statDoc.getInteger("status1Count", 0);
+ status0Count = statDoc.getInteger("status0Count", 0);
+ statusMinus1Count = statDoc.getInteger("statusMinus1Count", 0);
+ missOkCount = statDoc.getInteger("missOkCount", 0);
+ }
+ int total = status1Count + status0Count + statusMinus1Count;
BigDecimal onlineRate = BigDecimal.ZERO;
-// 1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� |
- if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
- //resultCount.get(0)鏄�绘暟 uniqueDeviceIdCount鏄洿鍏风郴缁熷弬鏁版煡璇㈠埌mongodb涓ぇ浜庣瓑浜� recordDuration瀛楁鐨勬�绘暟
- onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+ if (total != 0) { // 鍙湁褰搕otal涓嶄负0鏃讹紝鎵嶈绠楁瘮鐜�
+ onlineRate = new BigDecimal(missOkCount)
+ .divide(new BigDecimal(total), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
}
- resultCount.add(this.remove0(onlineRate));
-
- HashMap<String, Object> map = new HashMap<>();
- map.put("count", resultCount);
- map.put("list", resultList);
- return Result.ok().data(map).total(total);
+ List<String> list = new ArrayList<>();
+ list.add(total +"");
+ list.add(status1Count +"");
+ list.add(status0Count +"");
+ list.add(statusMinus1Count +"");
+ list.add(this.remove0(onlineRate));
+ return list;
}
/**
@@ -1709,6 +2390,7 @@
*/
@Override
public Result deptVideoAvailabilityRate(DataCenterQuery params) {
+ List<String> noString = tMonitorMapper.getIdListVideo();
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
SysDept sysDept = getSysDeptByLoginUser();
AreaDeptEnum areaDeptEnum = null;
@@ -1723,10 +2405,15 @@
}else {
query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
}
+ if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯�
+ query.addCriteria(Criteria.where("no").in(noString));
+ }
//涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
if (params.getOption() != null) {
query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
}
+ //鏂板閮ㄧ骇鍒ゆ柇
+ query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -1736,104 +2423,12 @@
AreaDeptEnum areaDeptEnumInfo = AreaDeptEnum.fromCode(areaCode);
if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
});
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
- List<Integer> status = Arrays.asList(1, 0, -1);
- AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
- List<String> resultCount = status.stream().map(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);
- if (finalAreaDeptEnum != null){
- dList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", dList);
- // 鏋勫缓鑱氬悎绠￠亾
- 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 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- //璁＄畻閮ㄧ骇褰曞儚鍙敤鐜�
- MongoDatabase database2 = mongoTemplate.getDb();
- MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
- double finalRecordingMinTime = getSySMinTime();
-
- List<Document> documentList = new ArrayList<>(4);
- documentList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
- setTag(params, documentList);
- Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
- documentList.add(recording);
- if (finalAreaDeptEnum != null){
- documentList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", documentList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- AggregateIterable<Document> result = collection2.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- log.error("閮ㄧ骇褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
-
-
-
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getMinistryVideoAvailable)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistryVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
-// }
- //鍔犱竴涓�绘暟
- int totalCount = 0;
- for (String s : resultCount) {
- totalCount += Integer.parseInt(s);
- }
- resultCount.add(0, totalCount + "");
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
- onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
- resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", resultCount);
+ map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.DEPT_VIDEO_POINT_ONLINE_RATE.name()));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
-
/**
* 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼
*
@@ -1842,6 +2437,7 @@
*/
@Override
public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
+ List<String> noString = tMonitorMapper.getIdListVideo();
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
SysDept sysDept = getSysDeptByLoginUser();
AreaDeptEnum areaDeptEnum = null;
@@ -1857,10 +2453,14 @@
query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
}
query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+ if (CollectionUtils.isNotEmpty(noString)) { // 闃叉绌洪泦鍚堝紓甯�
+ query.addCriteria(Criteria.where("no").in(noString));
+ }
//涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
if (params.getOption() != null) {
query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
}
+
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -1871,96 +2471,84 @@
if (areaDeptEnumInfo != null) item.setArealayername(areaDeptEnumInfo.getName());
});
// 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
- List<Integer> status = Arrays.asList(1, 0, -1);
- AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
- List<String> resultCount = status.stream().map(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);
- if (finalAreaDeptEnum != null){
- dList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", dList);
- // 鏋勫缓鑱氬悎绠￠亾
- 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 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- //璁＄畻閲嶇偣鐐逛綅褰曞儚鍙敤鐜�
- MongoDatabase database2 = mongoTemplate.getDb();
- MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
- double finalRecordingMinTime = getSySMinTime();
-
- List<Document> documentList = new ArrayList<>(4);
- documentList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
- setTag(params, documentList);
- Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
- documentList.add(recording);
- if (finalAreaDeptEnum != null){
- documentList.add(new Document("$and", Arrays.asList(
-// new Document("no", new Document("$in", noString)),
- new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
- )));
- }
- Document filter = new Document("$and", documentList);
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceId")),
- new Document("$count", "uniqueDeviceIds")
- );
- AggregateIterable<Document> result = collection2.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- log.error("閲嶇偣鐐逛綅褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
-
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getKeyVideoAvailable)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// MongoDatabase database = mongoTemplate.getDb();
+// MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum");
+// List<Integer> status = Arrays.asList(1, 0, -1);
+// AreaDeptEnum finalAreaDeptEnum = areaDeptEnum;
+// List<String> resultCount = status.stream().map(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);
+// if (finalAreaDeptEnum != null){
+// dList.add(new Document("$and", Arrays.asList(
+//// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
+// }
+// Document filter = new Document("$and", dList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// 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 鍙細浜х敓涓�涓粨鏋�
+// }
+// return uniqueDeviceIdCount + "";
+// }).collect(Collectors.toList());
+//
+// //璁＄畻閲嶇偣鐐逛綅褰曞儚鍙敤鐜�
+// MongoDatabase database2 = mongoTemplate.getDb();
+// MongoCollection<Document> collection2 = database2.getCollection("uy_record_meta_d_sum");
+// double finalRecordingMinTime = getSySMinTime();
+//
+// List<Document> documentList = new ArrayList<>(4);
+// documentList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE)));
+// setTag(params, documentList);
+// Document recording = new Document("missDuration",new Document("$lte", finalRecordingMinTime));
+// documentList.add(recording);
+// if (finalAreaDeptEnum != null){
+// documentList.add(new Document("$and", Arrays.asList(
+//// new Document("no", new Document("$in", noString)),
+// new Document("no", new Document("$regex", "^" + finalAreaDeptEnum.getCode()))
+// )));
// }
- //鍔犱竴涓�绘暟
- int totalCount = 0;
- for (String s : resultCount) {
- totalCount += Integer.parseInt(s);
- }
- resultCount.add(0, totalCount + "");
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
- onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
- resultCount.add(this.remove0(onlineRate));
+// Document filter = new Document("$and", documentList);
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceId")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// AggregateIterable<Document> result = collection2.aggregate(pipeline);
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// log.error("閲嶇偣鐐逛綅褰曞儚鍙敤鐜噞}:",uniqueDeviceIdCount);
+//
+// //鍔犱竴涓�绘暟
+// int totalCount = 0;
+// for (String s : resultCount) {
+// totalCount += Integer.parseInt(s);
+// }
+// resultCount.add(0, totalCount + "");
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (!StringUtils.isEmpty(resultCount.get(0)) && !"0".equals(resultCount.get(0))) {
+// onlineRate = new BigDecimal(uniqueDeviceIdCount).divide(new BigDecimal(resultCount.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", resultCount);
+ map.put("count", this.buildCount(areaDeptEnum,noString,params,DataCenterMethodNameEnum.VIDEO_IMPORTANT_POINT_AVAILABILITY_RATE.name()));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -2018,6 +2606,7 @@
*/
@Override
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
+ long startTime = System.currentTimeMillis();
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
SysDept sysDept = getSysDeptByLoginUser();
List<Criteria> andCriteria;
@@ -2033,147 +2622,248 @@
andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, null);
}
- Query query = new Query();
- Criteria and = new Criteria();
- and.andOperator(andCriteria);
- query = Query.query(and);
- query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
+ List<Criteria> allCriteria = new ArrayList<>(andCriteria);
+ allCriteria.add(Criteria.where("importantTag").is(Boolean.TRUE)); // 鍩虹鏍囩鏉′欢
// 涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
if (params.getOption() != null) {
if (params.getOption() == 1) {
- andCriteria.add(Criteria.where("osdNameCorrect").is(1));
- andCriteria.add(Criteria.where("osdTimeCorrect").is(1));
- andCriteria.add(Criteria.where("osdProvinceCorrect").is(1));
- andCriteria.add(Criteria.where("osdCityCorrect").is(1));
- andCriteria.add(Criteria.where("osdPartCorrect").is(1));
- Criteria and2 = new Criteria();
- and2.andOperator(andCriteria);
- query = Query.query(and2);
+ // 鍙犲姞锛氭墍鏈夊瓧娈靛繀椤讳负1锛堟纭級
+ allCriteria.add(new Criteria().andOperator(
+ Criteria.where("osdNameCorrect").is(1),
+ Criteria.where("osdTimeCorrect").is(1),
+ Criteria.where("osdProvinceCorrect").is(1),
+ Criteria.where("osdCityCorrect").is(1),
+ Criteria.where("osdPartCorrect").is(1)
+ ));
} else if (params.getOption() == -1) {
- // 浣跨敤$or鏉′欢杩炴帴澶氫釜瀛楁妫�鏌ワ紝姣忎釜瀛楁妫�鏌ユ槸鍚︾瓑浜�-1
- Criteria c1 = Criteria.where("osdNameCorrect").is(-1);
- Criteria c2 = Criteria.where("osdTimeCorrect").is(-1);
- Criteria c3 = Criteria.where("osdProvinceCorrect").is(-1);
- Criteria c4 = Criteria.where("osdCityCorrect").is(-1);
- Criteria c5 = Criteria.where("osdPartCorrect").is(-1);
- Criteria orOperator = new Criteria().orOperator(c1, c2, c3, c4, c5);
- orOperator.andOperator(andCriteria);
- query = Query.query(orOperator);
+ // 鍙犲姞锛氫换涓�瀛楁涓�-1锛堝紓甯革級
+ allCriteria.add(new Criteria().orOperator(
+ Criteria.where("osdNameCorrect").is(-1),
+ Criteria.where("osdTimeCorrect").is(-1),
+ Criteria.where("osdProvinceCorrect").is(-1),
+ Criteria.where("osdCityCorrect").is(-1),
+ Criteria.where("osdPartCorrect").is(-1)
+ ));
} else {
- Criteria c1 = Criteria.where("osdNameCorrect").is(0);
- Criteria c2 = Criteria.where("osdTimeCorrect").is(0);
- Criteria c3 = Criteria.where("osdProvinceCorrect").is(0);
- Criteria c4 = Criteria.where("osdCityCorrect").is(0);
- Criteria c5 = Criteria.where("osdPartCorrect").is(0);
- Criteria orOperator = new Criteria().orOperator(c1, c2, c3, c4, c5);
- orOperator.andOperator(andCriteria);
- query = Query.query(orOperator);
+ // 鍙犲姞锛氫换涓�瀛楁涓�0锛堟湭鐭ワ級
+ allCriteria.add(new Criteria().orOperator(
+ Criteria.where("osdNameCorrect").is(0),
+ Criteria.where("osdTimeCorrect").is(0),
+ Criteria.where("osdProvinceCorrect").is(0),
+ Criteria.where("osdCityCorrect").is(0),
+ Criteria.where("osdPartCorrect").is(0)
+ ));
}
}
+ Criteria finalCriteria = new Criteria().andOperator(allCriteria);
+ Query query = Query.query(finalCriteria);
+
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
+ log.info("鍒嗛〉鏌ヨ鏉′欢锛歩mportantTag=true, option={}, startTime={}, endTime={}",
+ params.getOption(), params.getStartTime(), params.getEndTime());
for (OsdCheckResult osdCheckResult : resultList) {
OsdCheckResult.getError(osdCheckResult);
}
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("osd_check_result");
- // 纭繚鍦ㄧ粺璁℃煡璇腑涔熷簲鐢ㄧ浉鍚岀殑杩囨护鏉′欢
- Document areDocument = null;
- if (areaDeptEnum != null) {
- String areaCodePrefix = areaDeptEnum.getCode();
- areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
- }
- // 鎬绘暟
- List<Document> dList = new ArrayList<>(2);
- if (areDocument != null){
- dList.add(areDocument);
- }
- dList.add(new Document("importantTag", Boolean.TRUE));
- setTag(params, dList);
+ long endTime = System.currentTimeMillis();
+ log.info("鏌ヨ鍒嗛〉鎵�鐢ㄦ椂闂�:{}ms",endTime -startTime);
- Document osdFilter = new Document("$and", dList);
- // 姝ｅ父鏁�
- List<Document> dList1 = new ArrayList<>(2);
- if (areDocument != null){
- dList1.add(areDocument);
- }
- dList1.add(new Document("importantTag", Boolean.TRUE));
- dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
- setTag(params, dList1);
- Document osdCorrectFilter = new Document("$and", dList1);
- //寮傚父鏁�
- List<Document> dList2 = new ArrayList<>(2);
- if (areDocument != null){
- dList2.add(areDocument);
- }
- setTag(params, dList2);
- Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
- dList2.add(importantTagCondition);
- List<Document> errorConditions = new ArrayList<>();
- errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdProvinceCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
- Document errorFilter = new Document("$or", errorConditions);
- dList2.add(errorFilter);
-
- Document osdErrorFilter = new Document("$and", dList2);
-
- // 鏈煡鏁�
- List<Document> dList3 = new ArrayList<>(2);
- if (areDocument != null){
- dList3.add(areDocument);
- }
- setTag(params, dList3);
- dList3.add(importantTagCondition);
- List<Document> unknownConditions = new ArrayList<>();
- unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
- Document unknownFilter = new Document("$or", unknownConditions);
- dList3.add(unknownFilter);
-
- Document osdUnknownFilter = new Document("$and", dList3);
-
- List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter);
- List<String> rList = lists.stream().map(filter -> {
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceNo")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
- onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
- rList.add(this.remove0(onlineRate));
+// // 缁熻鏁伴噺
+// MongoDatabase database = mongoTemplate.getDb();
+// MongoCollection<Document> collection = database.getCollection("osd_check_result");
+// // 纭繚鍦ㄧ粺璁℃煡璇腑涔熷簲鐢ㄧ浉鍚岀殑杩囨护鏉′欢
+// Document areDocument = null;
+// if (areaDeptEnum != null) {
+// String areaCodePrefix = areaDeptEnum.getCode();
+// areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+// }
+// // 鎬绘暟
+// List<Document> dList = new ArrayList<>(2);
+// if (areDocument != null){
+// dList.add(areDocument);
+// }
+// dList.add(new Document("importantTag", Boolean.TRUE));
+// setTag(params, dList);
+//
+// Document osdFilter = new Document("$and", dList);
+// // 姝ｅ父鏁�
+// List<Document> dList1 = new ArrayList<>(2);
+// if (areDocument != null){
+// dList1.add(areDocument);
+// }
+// dList1.add(new Document("importantTag", Boolean.TRUE));
+// dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
+// setTag(params, dList1);
+//
+// Document osdCorrectFilter = new Document("$and", dList1);
+// //寮傚父鏁�
+// List<Document> dList2 = new ArrayList<>(2);
+// if (areDocument != null){
+// dList2.add(areDocument);
+// }
+// setTag(params, dList2);
+// Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
+// dList2.add(importantTagCondition);
+// List<Document> errorConditions = new ArrayList<>();
+// errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdProvinceCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
+// Document errorFilter = new Document("$or", errorConditions);
+// dList2.add(errorFilter);
+//
+// Document osdErrorFilter = new Document("$and", dList2);
+//
+// // 鏈煡鏁�
+// List<Document> dList3 = new ArrayList<>(2);
+// if (areDocument != null){
+// dList3.add(areDocument);
+// }
+// setTag(params, dList3);
+// dList3.add(importantTagCondition);
+// List<Document> unknownConditions = new ArrayList<>();
+// unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
+// Document unknownFilter = new Document("$or", unknownConditions);
+// dList3.add(unknownFilter);
+//
+// Document osdUnknownFilter = new Document("$and", dList3);
+// //todo 淇敼鏌ヨ閫昏緫涓嶈蛋寰幆 杩炴帴涓夋 璧颁竴娆℃煡璇�
+// List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter);
+// List<String> rList = lists.stream().map(filter -> {
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceNo")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+// AggregateIterable<Document> result = collection.aggregate(pipeline);
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// return uniqueDeviceIdCount + "";
+// }).collect(Collectors.toList());
+//
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+// onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// rList.add(this.remove0(onlineRate));
+ List<String> countList = this.buildPointLabelingAccuracyCount(areaDeptEnum,params,likeFileds);
HashMap<String, Object> map = new HashMap<>();
- map.put("count", rList);
+ map.put("count", countList);
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
+ private List<String> buildPointLabelingAccuracyCount(AreaDeptEnum areaDeptEnum,DataCenterQuery params,List<String> likeFileds){
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("osd_check_result");
+ List<Document> baseFilterList = new ArrayList<>();
+ baseFilterList.add(new Document("importantTag",new Document("$eq", Boolean.TRUE)));
+ if (areaDeptEnum != null){
+ baseFilterList.add(new Document("deviceNo",new Document("$regex","^" + areaDeptEnum.getCode())));
+ }
+ setTag(params, baseFilterList,"checkTime");
+
+ Document matchStage = new Document("$match",new Document("$and",baseFilterList));
+ List<Document> pipeline = new ArrayList<>();
+ pipeline.add(matchStage);
+
+ Document groupByDeviceStage = new Document("$group",
+ new Document("_id","$deviceNo")
+ .append("correctFlag",new Document("$sum",
+ new Document("$cond",Arrays.asList(
+ new Document("$and",Arrays.asList(
+ new Document("$eq",Arrays.asList("$osdNameCorrect",1)),
+ new Document("$eq", Arrays.asList("$osdTimeCorrect", 1)),
+ new Document("$eq", Arrays.asList("$osdProvinceCorrect", 1)),
+ new Document("$eq", Arrays.asList("$osdCityCorrect", 1)),
+ new Document("$eq", Arrays.asList("$osdPartCorrect", 1))
+ )),
+ 1,0
+ ))
+ ))
+ // 鏍囪锛氭槸鍚︿换涓�瀛楁涓�-1锛堝紓甯革級
+ .append("errorFlag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$or", Arrays.asList(
+ new Document("$eq", Arrays.asList("$osdNameCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdTimeCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdProvinceCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdCityCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdPartCorrect", -1))
+ )),
+ 1, 0
+ ))
+ ))
+ // 鏍囪锛氭槸鍚︿换涓�瀛楁涓�0锛堟湭鐭ワ級
+ .append("unknownFlag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$or", Arrays.asList(
+ new Document("$eq", Arrays.asList("$osdNameCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdTimeCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdProvinceCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdCityCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdPartCorrect", 0))
+ )),
+ 1, 0
+ ))
+ ))
+ );
+ pipeline.add(groupByDeviceStage);
+ Document groupGlobalStage = new Document("$group",
+ new Document("_id", null)
+ .append("totalCount", new Document("$sum", 1)) // 鏍稿績淇敼锛氱洿鎺ョ疮鍔犺澶囧垎缁勬暟
+ .append("correctCount", new Document("$sum", "$correctFlag"))
+ .append("errorCount", new Document("$sum", "$errorFlag"))
+ .append("unknownCount", new Document("$sum", "$unknownFlag"))
+ );
+ pipeline.add(groupGlobalStage);
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregateIterable<Document> aggregateResult = collection.aggregate(pipeline);
+ Document statDoc = null;
+ for (Document doc : aggregateResult) {
+ statDoc = doc;
+ break;
+ }
+ // 瑙ｆ瀽缁撴灉锛堥粯璁ゅ��0閬垮厤绌烘寚閽堬級
+ int totalCount = 0, correctCount = 0, errorCount = 0, unknownCount = 0;
+ if (statDoc != null) {
+ totalCount = statDoc.getInteger("totalCount", 0);
+ correctCount = statDoc.getInteger("correctCount", 0);
+ errorCount = statDoc.getInteger("errorCount", 0);
+ unknownCount = statDoc.getInteger("unknownCount", 0);
+ }
+ BigDecimal accuracyRate = BigDecimal.ZERO;
+ if (totalCount != 0) {
+ accuracyRate = new BigDecimal(correctCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+ // 鎸夊師鏍煎紡杩斿洖缁熻缁撴灉锛坱otal, correct, error, unknown, rate锛�
+ List<String> countList = new ArrayList<>();
+ countList.add(String.valueOf(totalCount));
+ countList.add(String.valueOf(correctCount));
+ countList.add(String.valueOf(errorCount));
+ countList.add(String.valueOf(unknownCount));
+ countList.add(this.remove0(accuracyRate));
+ return countList;
+ }
+
@Override
public void videoImportantPointLabelingAccuracyExport(HttpServletResponse response, DataCenterQuery params) {
@@ -2303,116 +2993,225 @@
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
- Document areDocument = null;
- if (areaDeptEnum != null) {
- String areaCodePrefix = areaDeptEnum.getCode();
- areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
- }
+// Document areDocument = null;
+// if (areaDeptEnum != null) {
+// String areaCodePrefix = areaDeptEnum.getCode();
+// areDocument = new Document("deviceNo", new Document("$regex", "^" + areaCodePrefix));
+// }
for (OsdCheckResult osdCheckResult : resultList) {
OsdCheckResult.getError(osdCheckResult);
}
- // 缁熻鏁伴噺
- MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("osd_check_result");
- //鎬绘暟
- List<Document> dList = new ArrayList<>(3);
- if (areDocument != null){
- dList.add(areDocument);
- }
- dList.add(new Document("importantTag", Boolean.TRUE));
- setTag(params, dList);
- Document osdFilter = new Document("$and", dList);
- //姝ｅ父鏁�
- List<Document> dList1 = new ArrayList<>(2);
- dList1.add(new Document("importantTag", Boolean.TRUE));
- dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
- dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
- if (areDocument != null){
- dList1.add(areDocument);
- }
- setTag(params, dList1);
- Document osdCorrectFilter = new Document("$and", dList1);
- //寮傚父鏁�
- List<Document> dList2 = new ArrayList<>(2);
- if (areDocument != null){
- dList2.add(areDocument);
- }
- setTag(params, dList2);
- Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
- dList2.add(importantTagCondition);
- List<Document> errorConditions = new ArrayList<>();
- errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdProvinceCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
- errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
- Document errorFilter = new Document("$or", errorConditions);
- dList2.add(errorFilter);
- Document osdErrorFilter = new Document("$and", dList2);
- //鏈煡鏁�
- List<Document> dList3 = new ArrayList<>(2);
- if (areDocument != null){
- dList3.add(areDocument);
- }
- setTag(params, dList3);
- dList3.add(importantTagCondition);
- List<Document> unknownConditions = new ArrayList<>();
- unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0)));
- unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
- // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠�
- Document unknownFilter = new Document("$or", unknownConditions);
- dList3.add(unknownFilter);
- Document osdUnknownFilter = new Document("$and", dList3);
-
- List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter);
- List<String> rList = lists.stream().map(filter -> {
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$deviceNo")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
-// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
-// .select(CheckIndexVideo::getKeyTimingAccuracy)
-// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
-// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
-// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
-// .list();
-// BigDecimal onlineRate = BigDecimal.ZERO;
-// if (CollectionUtils.isNotEmpty(videoList)) {
-// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal count = BigDecimal.valueOf(videoList.size());
-// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+// // 缁熻鏁伴噺
+// MongoDatabase database = mongoTemplate.getDb();
+// MongoCollection<Document> collection = database.getCollection("osd_check_result");
+// //鎬绘暟
+// List<Document> dList = new ArrayList<>(3);
+// if (areDocument != null){
+// dList.add(areDocument);
// }
- BigDecimal onlineRate = BigDecimal.ZERO;
- if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
- onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
- }
- rList.add(this.remove0(onlineRate));
+// dList.add(new Document("importantTag", Boolean.TRUE));
+// setTag(params, dList);
+// Document osdFilter = new Document("$and", dList);
+// //姝ｅ父鏁�
+// List<Document> dList1 = new ArrayList<>(2);
+// dList1.add(new Document("importantTag", Boolean.TRUE));
+// dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
+// dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
+// if (areDocument != null){
+// dList1.add(areDocument);
+// }
+// setTag(params, dList1);
+// Document osdCorrectFilter = new Document("$and", dList1);
+// //寮傚父鏁�
+// List<Document> dList2 = new ArrayList<>(2);
+// if (areDocument != null){
+// dList2.add(areDocument);
+// }
+// setTag(params, dList2);
+// Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
+// dList2.add(importantTagCondition);
+// List<Document> errorConditions = new ArrayList<>();
+// errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdProvinceCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
+// errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
+// Document errorFilter = new Document("$or", errorConditions);
+// dList2.add(errorFilter);
+// Document osdErrorFilter = new Document("$and", dList2);
+// //鏈煡鏁�
+// List<Document> dList3 = new ArrayList<>(2);
+// if (areDocument != null){
+// dList3.add(areDocument);
+// }
+// setTag(params, dList3);
+// dList3.add(importantTagCondition);
+// List<Document> unknownConditions = new ArrayList<>();
+// unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0)));
+// unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
+// // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠�
+// Document unknownFilter = new Document("$or", unknownConditions);
+// dList3.add(unknownFilter);
+// Document osdUnknownFilter = new Document("$and", dList3);
+//
+// List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter, osdUnknownFilter);
+// List<String> rList = lists.stream().map(filter -> {
+// // 鏋勫缓鑱氬悎绠￠亾
+// List<Document> pipeline = Arrays.asList(
+// new Document("$match", filter),
+// // $group 鍘婚噸
+// new Document("$group", new Document("_id", "$deviceNo")),
+// new Document("$count", "uniqueDeviceIds")
+// );
+// // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+// AggregateIterable<Document> result = collection.aggregate(pipeline);
+// Integer uniqueDeviceIdCount = 0;
+// for (Document doc : result) {
+// uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+// break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+// }
+// return uniqueDeviceIdCount + "";
+// }).collect(Collectors.toList());
+//
+//// List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+//// .select(CheckIndexVideo::getKeyTimingAccuracy)
+//// .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+//// .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+//// .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
+//// .list();
+//// BigDecimal onlineRate = BigDecimal.ZERO;
+//// if (CollectionUtils.isNotEmpty(videoList)) {
+//// BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add);
+//// BigDecimal count = BigDecimal.valueOf(videoList.size());
+//// onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
+//// }
+// BigDecimal onlineRate = BigDecimal.ZERO;
+// if (!StringUtils.isEmpty(rList.get(0)) && !"0".equals(rList.get(0))) {
+// onlineRate = new BigDecimal(rList.get(1)).divide(new BigDecimal(rList.get(0)), 3,RoundingMode.DOWN).multiply(new BigDecimal("100"));
+// }
+// rList.add(this.remove0(onlineRate));
+ List<String> rList = this.buildTimeAccuracyCount(areaDeptEnum,params,likeFileds);
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
+ private List<String> buildTimeAccuracyCount(AreaDeptEnum areaDeptEnum, DataCenterQuery params, List<String> likeFileds) {
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("osd_check_result");
+ List<Document> baseFilterList = new ArrayList<>();
+ // 鍩虹杩囨护鏉′欢锛堜笌鍒楄〃鏌ヨ涓�鑷达級
+ baseFilterList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE))); // 閲嶈鏍囩
+ if (areaDeptEnum != null) {
+ // 璁惧鍙峰墠缂�鍖归厤锛堝尯鍩熻繃婊わ級
+ baseFilterList.add(new Document("deviceNo", new Document("$regex", "^" + areaDeptEnum.getCode())));
+ }
+ // 鏃堕棿杩囨护锛氫娇鐢� checkTime锛屼笌鍒楄〃鏌ヨ銆佺储寮曠粺涓�锛堣皟鐢ㄦ敼閫犲悗鐨� setTag锛�
+ this.setTag(params, baseFilterList, "checkTime");
+ // 妯＄硦鏌ヨ锛坉eviceNo銆乷sdName锛屼笌鍒楄〃鏌ヨ涓�鑷达級
+// if (StringUtils.hasText(params.getKeyword()) && !CollectionUtils.isEmpty(likeFileds)) {
+// String keyword = Pattern.quote(params.getKeyword());
+// List<Document> likeConditions = new ArrayList<>();
+// for (String field : likeFileds) {
+// likeConditions.add(new Document(field, new Document("$regex", ".*?" + keyword + ".*")));
+// }
+// baseFilterList.add(new Document("$or", likeConditions));
+// }
+
+ // 鏋勫缓鑱氬悎绠￠亾
+ List<Document> pipeline = new ArrayList<>();
+ // 闃舵1锛氬熀纭�杩囨护
+ pipeline.add(new Document("$match", new Document("$and", baseFilterList)));
+
+ // 闃舵2锛氭寜 deviceNo 鍒嗙粍鍘婚噸锛屾爣璁版椂闂村瓧娈电殑鐘舵��
+ pipeline.add(new Document("$group", new Document("_id", "$deviceNo")
+ // 鏍囪锛氭墍鏈夊瓧娈靛潎涓�1锛堟纭級鈫� $and 缁勫悎5涓潯浠�
+ .append("timeCorrectFlag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$and", Arrays.asList( // 鏉′欢锛�5涓瓧娈靛叏閮ㄤ负1
+ new Document("$eq", Arrays.asList("$osdTimeCorrect", 1)),
+ new Document("$eq", Arrays.asList("$osdNameCorrect", 1)),
+ new Document("$eq", Arrays.asList("$osdProvinceCorrect", 1)),
+ new Document("$eq", Arrays.asList("$osdCityCorrect", 1)),
+ new Document("$eq", Arrays.asList("$osdPartCorrect", 1))
+ )),
+ 1, 0
+ ))
+ ))
+ // 鏍囪锛氭椂闂撮敊璇紙osdTimeCorrect=-1锛�
+ .append("timeErrorFlag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$or", Arrays.asList( // 鏉′欢锛�5涓瓧娈典换涓�涓�-1
+ new Document("$eq", Arrays.asList("$osdTimeCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdNameCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdProvinceCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdCityCorrect", -1)),
+ new Document("$eq", Arrays.asList("$osdPartCorrect", -1))
+ )),
+ 1, 0
+ ))
+ ))
+ // 鏍囪锛氭椂闂存湭鐭ワ紙osdTimeCorrect=0锛�
+ .append("timeUnknownFlag", new Document("$sum",
+ new Document("$cond", Arrays.asList(
+ new Document("$or", Arrays.asList( // 鏉′欢锛�5涓瓧娈典换涓�涓�0
+ new Document("$eq", Arrays.asList("$osdTimeCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdNameCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdProvinceCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdCityCorrect", 0)),
+ new Document("$eq", Arrays.asList("$osdPartCorrect", 0))
+ )),
+ 1, 0
+ ))
+ ))
+ ));
+
+ // 闃舵3锛氬叏灞�缁熻锛堟眹鎬昏澶囨暟锛�
+ pipeline.add(new Document("$group", new Document("_id", null)
+ .append("totalCount", new Document("$sum", 1)) // 鎬昏澶囨暟锛堝幓閲嶅悗锛�
+ .append("correctCount", new Document("$sum", "$timeCorrectFlag")) // 鏃堕棿姝ｇ‘鐨勮澶囨暟
+ .append("errorCount", new Document("$sum", "$timeErrorFlag")) // 鏃堕棿閿欒鐨勮澶囨暟
+ .append("unknownCount", new Document("$sum", "$timeUnknownFlag")) // 鏃堕棿鏈煡鐨勮澶囨暟
+ ));
+
+ // 鎵ц鑱氬悎鏌ヨ
+ AggregateIterable<Document> aggregateResult = collection.aggregate(pipeline);
+ Document statDoc = aggregateResult.first(); // 鍏ㄥ眬鍒嗙粍浠呰繑鍥炰竴鏉＄粨鏋�
+
+ // 瑙ｆ瀽缁撴灉锛堥粯璁�0閬垮厤绌烘寚閽堬級
+ int totalCount = 0, correctCount = 0, errorCount = 0, unknownCount = 0;
+ if (statDoc != null) {
+ totalCount = statDoc.getInteger("totalCount", 0);
+ correctCount = statDoc.getInteger("correctCount", 0);
+ errorCount = statDoc.getInteger("errorCount", 0);
+ unknownCount = statDoc.getInteger("unknownCount", 0);
+ }
+
+ // 璁＄畻鏃堕棿鍑嗙‘鐜囷紙姝ｇ‘鏁�/鎬绘暟锛�
+ BigDecimal accuracyRate = BigDecimal.ZERO;
+ if (totalCount != 0) {
+ accuracyRate = new BigDecimal(correctCount)
+ .divide(new BigDecimal(totalCount), 3, RoundingMode.DOWN)
+ .multiply(new BigDecimal("100"));
+ }
+
+ // 鎸夋牸寮忚繑鍥烇細[鎬绘暟, 姝ｇ‘鏁�, 閿欒鏁�, 鏈煡鏁�, 鍑嗙‘鐜嘳
+ List<String> countList = new ArrayList<>();
+ countList.add(String.valueOf(totalCount));
+ countList.add(String.valueOf(correctCount));
+ countList.add(String.valueOf(errorCount));
+ countList.add(String.valueOf(unknownCount));
+ countList.add(this.remove0(accuracyRate));
+ return countList;
+ }
/**
* 杞﹁締锛氳鍥惧簱瀵规帴绋冲畾鎬�
@@ -2789,6 +3588,8 @@
);
// 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
AggregateIterable<Document> result = collection.aggregate(pipeline);
+// Document explain = collection.aggregate(pipeline).explain();
+// log.info("鎵撳嵃璁″垝:{}",explain);
Integer uniqueDeviceIdCount = 0;
for (Document doc : result) {
uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
@@ -3924,6 +4725,8 @@
);
// 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
AggregateIterable<Document> result = collection.aggregate(pipeline);
+// Document explain = collection.aggregate(pipeline).explain();
+// log.info("鎵撳嵃鎵ц璁″垝璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬э細{}",explain);
Integer uniqueDeviceIdCount = 0;
for (Document doc : result) {
uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
@@ -4165,4 +4968,22 @@
if (params.getEndTime() != null) mongoCreateTimeRange.append("$lt", params.getEndTime());
dList.add(new Document("mongoCreateTime", mongoCreateTimeRange));
}
+ private void setTag(DataCenterQuery params, List<Document> dList, String timeField) {
+ // 鏁版嵁绫诲瀷杩囨护锛堜繚鎸佸師鏈夐�昏緫锛�
+ if (params.getDataType() != null) { // 鍔犵┖鍒ゆ柇锛岄伩鍏峃PE
+ 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)));
+ }
+ }
+ // 鏃堕棿杩囨护锛氫娇鐢ㄤ紶鍏ョ殑鏃堕棿瀛楁鍚嶏紙涓嶅啀纭紪鐮乵ongoCreateTime锛�
+ if (params.getStartTime() != null || params.getEndTime() != null) {
+ Document timeRange = new Document();
+ if (params.getStartTime() != null) timeRange.append("$gte", params.getStartTime());
+ if (params.getEndTime() != null) timeRange.append("$lt", params.getEndTime());
+ dList.add(new Document(timeField, timeRange)); // 鍔ㄦ�佹椂闂村瓧娈�
+ }
+ }
+
}
--
Gitblit v1.8.0