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 | 865 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 606 insertions(+), 259 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 44192d5..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.*;
@@ -1918,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();
@@ -1925,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<>();
@@ -1932,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)
@@ -1981,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;
@@ -2492,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;
@@ -2507,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) {
@@ -2777,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;
+ }
/**
* 杞﹁締锛氳鍥惧簱瀵规帴绋冲畾鎬�
@@ -3263,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");
@@ -4398,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");
@@ -4639,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