From 72dd95fdcde21b4641162d418d6fe8423bb74507 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 02:05:52 +0800
Subject: [PATCH] 数据中心优化完成、车辆url算法优化、大图可用算法优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 550 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 413 insertions(+), 137 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 0c7bf7f..8da0676 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
@@ -13,7 +13,9 @@
import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.*;
+import com.ycl.platform.domain.vo.DataCenter.BigPicUsefulVO;
import com.ycl.platform.domain.vo.DataCenter.MonitorQualifyResultVO;
+import com.ycl.platform.domain.vo.DataCenter.SnapClockVO;
import com.ycl.platform.domain.vo.PointDetailVO;
import com.ycl.platform.domain.vo.home.HomeFaceVO;
import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
@@ -1566,8 +1568,12 @@
if(params.getOption() ==1){
query.addCriteria(Criteria.where("lalType").is(ApiConstants.HK_Info_LayType_Normal));
query.addCriteria(Criteria.where("gbCodeType").is(ApiConstants.HK_Info_GbCodeType_Normal));
- }else if(params.getOption() !=-1){
-
+ }else if(params.getOption() ==-1){
+ Criteria lalType = Criteria.where("lalType").ne(ApiConstants.HK_Info_LayType_Normal);
+ Criteria gbCodeType = Criteria.where("gbCodeType").ne(ApiConstants.HK_Info_GbCodeType_Normal);
+ Criteria orOperator = new Criteria().orOperator(lalType, gbCodeType);
+ orOperator.andOperator(andCriteria);
+ query = Query.query(orOperator);
}
}
@@ -1588,8 +1594,8 @@
List<Document> dList3 = new ArrayList<>(2);
setTag(params, dList3);
List<Document> errorConditions = new ArrayList<>();
- errorConditions.add(new Document("lalType",new Document("$eq",-1)));
- errorConditions.add(new Document("gbCodeType",new Document("$eq",-1)));
+ errorConditions.add(new Document("lalType",new Document("$ne",1)));
+ errorConditions.add(new Document("gbCodeType",new Document("$ne",1)));
Document errorDoc = new Document("$or",errorConditions);
dList3.add(errorDoc);
Document totalFilter = new Document("$and", dList1);
@@ -1644,7 +1650,15 @@
public Result vehicleCollectionDataIntegrity(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ if(params.getOption()!=null){
+ //涓昏灞炴�т笉瀹屾暣
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("noIntegrityCount").gt(0));
+ }else if(params.getOption()==-1){
+ //灞炴�т笉瀹屾暣
+ query.addCriteria(Criteria.where("mainNoIntegrityCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class);
@@ -1653,11 +1667,33 @@
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_data_integrity_monitoring");
- Date now = new Date();
+ //鎶撴媿閲忔眰鍜�
+ // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+ List<Document> matchConditions = new ArrayList<>();
+ setTag(params, matchConditions);
+ List<Document> pipeline = Arrays.asList(
+ new Document("$match", new Document("$and", matchConditions)),
+ new Document("$group", new Document("_id", "$mongoCreateTime")
+ .append("dataCount", new Document("$sum", "$dataCount"))
+ .append("noIntegrityCount", new Document("$sum", "$noIntegrityCount"))
+ .append("mainNoIntegrityCount", new Document("$sum", "$mainNoIntegrityCount"))
+ ));
+ // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ int dataCount = 0;
+ int noIntegrityCount = 0;
+ int mainNoIntegrityCount = 0;
+ for (Document doc : result) {
+ dataCount = doc.getInteger("dataCount");
+ noIntegrityCount = doc.getInteger("noIntegrityCount");
+ mainNoIntegrityCount = doc.getInteger("mainNoIntegrityCount");
+ }
+
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleCaptureIntegrity)
.eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1665,9 +1701,13 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
-
+ List<String> countList = new ArrayList<>();
+ countList.add(dataCount+"");
+ countList.add(noIntegrityCount+"");
+ countList.add(mainNoIntegrityCount+"");
+ countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(this.remove0(onlineRate)));
+ map.put("count", countList);
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1682,16 +1722,49 @@
public Result vehicleCollectionDataCaptured(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ if(params.getOption()!=null){
+ //涓昏灞炴�т笉涓�鑷�
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("majorDiffCount").gt(0));
+ }else if(params.getOption()==-1){
+ //閲嶈灞炴�т笉涓�鑷�
+ query.addCriteria(Criteria.where("importantDiffCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<AttrRecognitionMonitorResult> resultList = mongoTemplate.find(query, AttrRecognitionMonitorResult.class);
- Date now = new Date();
+ // 缁熻鏁伴噺
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("hk_attr_recognition_monitor");
+
+ // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+ List<Document> matchConditions = new ArrayList<>();
+ setTag(params, matchConditions);
+ List<Document> pipeline = Arrays.asList(
+ new Document("$match", new Document("$and", matchConditions)),
+ new Document("$group", new Document("_id", "$mongoCreateTime")
+ .append("sampleCount", new Document("$sum", "$sampleCount"))
+ .append("majorDiffCount", new Document("$sum", "$majorDiffCount"))
+ .append("importantDiffCount", new Document("$sum", "$importantDiffCount"))
+ ));
+ // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ int sampleCount = 0;
+ int majorDiffCount = 0;
+ int importantDiffCount = 0;
+ for (Document doc : result) {
+ sampleCount = doc.getInteger("sampleCount");
+ majorDiffCount = doc.getInteger("majorDiffCount");
+ importantDiffCount = doc.getInteger("importantDiffCount");
+ }
+
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleCaptureAccuracy)
.eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1699,8 +1772,14 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+
+ List<String> countList = new ArrayList<>();
+ countList.add(sampleCount+"");
+ countList.add(majorDiffCount+"");
+ countList.add(importantDiffCount+"");
+ countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(this.remove0(onlineRate)));
+ map.put("count", countList);
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1715,30 +1794,46 @@
public Result vehicleClockAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ if(params.getOption()!=null){
+ //褰撴棩鏃堕挓寮傚父
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("majorDiffCount").gt(0));
+ }else if(params.getOption()==-1){
+ //鍏ㄩ儴鏃堕挓寮傚父
+ query.addCriteria(Criteria.where("importantDiffCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
-
+ List<SnapClockVO> resultVos = new ArrayList<>();
+ resultList.forEach(item->{
+ SnapClockVO vo = VehicleDeviceInspectionResult.getVO(item);
+ resultVos.add(vo);
+ });
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
List<Document> dList1 = new ArrayList<>(2);
- dList1.add(new Document("snapResult", new Document("$eq", 1)));
+ dList1.add(new Document("snapClock.todayClockResult", new Document("$eq", 1)));
setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("snapResult", new Document("$eq", 2)));
+ dList2.add(new Document("snapClock.todayClockResult", new Document("$eq", 0)));
setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
- dList3.add(new Document("snapResult", new Document("$eq", 4)));
+ dList3.add(new Document("snapClock.allClockResult", new Document("$eq", 1)));
setTag(params, dList3);
- Document ipErrFilter = new Document("$and", dList1);
- Document macdzErrFilter = new Document("$and", dList2);
- Document longitudeErrFilter = new Document("$and", dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("snapClock.allClockResult", new Document("$eq", 0)));
+ setTag(params, dList4);
+ Document todayFilter = new Document("$and", dList1);
+ Document todayErrFilter = new Document("$and", dList2);
+ Document allFilter = new Document("$and", dList3);
+ Document allErrFilter = new Document("$and", dList4);
- List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
+ List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter,allErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1757,11 +1852,11 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- Date now = new Date();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleTimingAccuracy)
.eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1772,7 +1867,7 @@
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
- map.put("list", resultList);
+ map.put("list", resultVos);
return Result.ok().data(map).total(total);
}
@@ -1786,17 +1881,58 @@
public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_CAR));
+ if(params.getOption()!=null){
+ //姝ｅ父
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("delayCount").is(0));
+ }else if(params.getOption()==-1){
+ //寤惰繜
+ query.addCriteria(Criteria.where("delayCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
-
// 缁熻鏁�
- Date now = new Date();
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("hk_snapshop_delay_monitor");
+
+ List<Document> dList1 = new ArrayList<>(2);
+ setTag(params, dList1);
+ dList1.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_CAR)));
+ Document allFilter = new Document("$and", dList1);
+ List<Document> dList2 = new ArrayList<>(2);
+ dList2.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_CAR)));
+ dList2.add(new Document("delayCount", new Document("$gt", 0)));
+ setTag(params, dList2);
+ Document delayFilter = new Document("$and", dList2);
+
+ List<Document> lists = Arrays.asList(allFilter,delayFilter);
+ List<String> rList = lists.stream().map(filter -> {
+ // 鏋勫缓鑱氬悎绠￠亾
+ List<Document> pipeline = Arrays.asList(
+ new Document("$match", filter),
+ // $group 鍘婚噸
+ new Document("$group", new Document("_id", "$externalIndexCode")),
+ new Document("$count", "uniqueDeviceIds")
+ );
+ // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ Integer uniqueDeviceIdCount = 0;
+ for (Document doc : result) {
+ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
+ break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
+ }
+ return uniqueDeviceIdCount + "";
+ }).collect(Collectors.toList());
+
+
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleUploadTimeliness)
.eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1804,8 +1940,9 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+ rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(this.remove0(onlineRate)));
+ map.put("count", rList);
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1820,17 +1957,44 @@
public Result vehicleUrlAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ if(params.getOption()!=null){
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("expCount").is(0));
+ }else if(params.getOption()==-1){
+ query.addCriteria(Criteria.where("expCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, PicAccessResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
+ query.with(Sort.by(Sort.Order.desc("expCount")));
List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class);
// 缁熻鏁�
- Date now = new Date();
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("hk_pic_access");
+ // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+ List<Document> matchConditions = new ArrayList<>();
+ setTag(params, matchConditions);
+ List<Document> pipeline = Arrays.asList(
+ new Document("$match", new Document("$and", matchConditions)),
+ new Document("$group", new Document("_id", "$mongoCreateTime")
+ .append("sampleCount", new Document("$sum", "$sampleCount"))
+ .append("expCount", new Document("$sum", "$expCount"))
+ ));
+ // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ int sampleCount = 0;
+ int expCount = 0;
+ for (Document doc : result) {
+ sampleCount = doc.getInteger("sampleCount");
+ expCount = doc.getInteger("expCount");
+ }
+
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehicleUrlAvailability)
.eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1838,8 +2002,13 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+ List<String> rList = new ArrayList<>();
+ rList.add(sampleCount+"");
+ rList.add(expCount+"");
+ rList.add(this.remove0(onlineRate));
+
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(this.remove0(onlineRate)));
+ map.put("count", rList);
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1854,17 +2023,48 @@
public Result vehicleBigImgAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ if(params.getOption()!=null){
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").is(0));
+ }else if(params.getOption()==-1){
+ query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
+ query.with(Sort.by(Sort.Order.desc("bigUseful.bigPicExpCount")));
List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
-
+ List<BigPicUsefulVO> voList = new ArrayList<>();
+ resultList.forEach(item->{
+ BigPicUsefulVO picVO = VehicleDeviceSamplingResult.getPicVO(item);
+ voList.add(picVO);
+ });
// 缁熻鏁�
- Date now = new Date();
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_sampling");
+ // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+ List<Document> matchConditions = new ArrayList<>();
+ setTag(params, matchConditions);
+ List<Document> pipeline = Arrays.asList(
+ new Document("$match", new Document("$and", matchConditions)),
+ new Document("$group", new Document("_id", "$mongoCreateTime")
+ .append("sampleCount", new Document("$sum", "$bigUseful.sampleCount"))
+ .append("expCount", new Document("$sum", "$bigUseful.bigPicExpCount"))
+ ));
+ // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ int sampleCount = 0;
+ int expCount = 0;
+ for (Document doc : result) {
+ sampleCount = doc.getInteger("sampleCount");
+ expCount = doc.getInteger("expCount");
+ }
+ List<String> countList = new ArrayList<>();
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getVehiclePictureAvailability)
.eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1872,9 +2072,12 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+ countList.add(sampleCount+"");
+ countList.add(expCount+"");
+ countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(this.remove0(onlineRate)));
- map.put("list", resultList);
+ map.put("count", countList);
+ map.put("list", voList);
return Result.ok().data(map).total(total);
}
@@ -1938,6 +2141,7 @@
}
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
+ //鎶撴媿閲忔眰鍜�
// 鏋勫缓鍩烘湰鐨�$match鏉′欢
List<Document> matchConditions = new ArrayList<>();
setTag(params, matchConditions);
@@ -2162,33 +2366,50 @@
@Override
public Result faceCollectionConsistency(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName");
- Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
+ List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, TIME_FIELD, likeFileds, null);
+ Query query = new Query();
+ Criteria and = new Criteria();
+ and.andOperator(andCriteria);
+ query = Query.query(and);
+ if(params.getOption()!=null){
+ if(params.getOption() ==1){
+ query.addCriteria(Criteria.where("lalType").is(ApiConstants.HK_Info_LayType_Normal));
+ query.addCriteria(Criteria.where("gbCodeType").is(ApiConstants.HK_Info_GbCodeType_Normal));
+ }else if(params.getOption() ==-1){
+ Criteria lalType = Criteria.where("lalType").ne(ApiConstants.HK_Info_LayType_Normal);
+ Criteria gbCodeType = Criteria.where("gbCodeType").ne(ApiConstants.HK_Info_GbCodeType_Normal);
+ Criteria orOperator = new Criteria().orOperator(lalType, gbCodeType);
+ orOperator.andOperator(andCriteria);
+ query = Query.query(orOperator);
+ }
+ }
- long total = mongoTemplate.count(query, CrossDetailResult.class);
+ long total = mongoTemplate.count(query, MonitoringDetailResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
- List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class);
+ List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("hk_cross_detail");
+ MongoCollection<Document> collection = database.getCollection("hk_monitoring_detail");
List<Document> dList1 = new ArrayList<>(2);
- dList1.add(new Document("lalType", new Document("$eq", 1)));
setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("lalType", new Document("$eq", 2)));
+ dList2.add(new Document("lalType", new Document("$eq", 1)));
+ dList2.add(new Document("gbCodeType", new Document("$eq", 1)));
setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
- dList3.add(new Document("lalType", new Document("$eq", 3)));
setTag(params, dList3);
- List<Document> dList4 = new ArrayList<>(2);
- dList4.add(new Document("lalType", new Document("$eq", 4)));
- setTag(params, dList4);
- Document ipErrFilter = new Document("$and", dList1);
- Document macdzErrFilter = new Document("$and", dList2);
- Document latitudeErrFilter = new Document("$and", dList3);
- Document longitudeErrFilter = new Document("$and", dList4);
- List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
+ List<Document> errorConditions = new ArrayList<>();
+ errorConditions.add(new Document("lalType",new Document("$ne",1)));
+ errorConditions.add(new Document("gbCodeType",new Document("$ne",1)));
+ Document errorDoc = new Document("$or",errorConditions);
+ dList3.add(errorDoc);
+ Document totalFilter = new Document("$and", dList1);
+ Document correctFilter = new Document("$and", dList2);
+ Document errorFilter = new Document("$and", dList3);
+
+ List<Document> lists = Arrays.asList(totalFilter, correctFilter, errorFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -2207,11 +2428,11 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFaceInformationCollectionAccuracy)
.eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2236,56 +2457,50 @@
public Result faceImgQualification(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
- long total = mongoTemplate.count(query, MonitoringDetailResult.class);
+ if(params.getOption()!=null){
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("faceEligibility.unfaceEligCount").is(0));
+ }else if(params.getOption()==-1){
+ query.addCriteria(Criteria.where("faceEligibility.unfaceEligCount").gt(0));
+ }
+ }
+ long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
+ query.with(Sort.by(Sort.Order.desc("faceEligibility.unfaceEligCount")));
MongoUtil.setPage(query, params, TIME_FIELD);
- List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class);
+ List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+ List<BigPicUsefulVO> voList = new ArrayList<>();
+ resultList.forEach(item->{
+ BigPicUsefulVO picVO = FaceDeviceSamplingResult.getEligeVO(item);
+ voList.add(picVO);
+ });
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("hk_monitoring_detail");
+ MongoCollection<Document> collection = database.getCollection("hk_face_device_sampling");
+ // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+ List<Document> matchConditions = new ArrayList<>();
+ setTag(params, matchConditions);
+ List<Document> pipeline = Arrays.asList(
+ new Document("$match", new Document("$and", matchConditions)),
+ new Document("$group", new Document("_id", "$mongoCreateTime")
+ .append("sampleCount", new Document("$sum", "$faceEligibility.sampleCount"))
+ .append("expCount", new Document("$sum", "$faceEligibility.unfaceEligCount"))
+ ));
+ // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ int sampleCount = 0;
+ int expCount = 0;
+ for (Document doc : result) {
+ sampleCount = doc.getInteger("sampleCount");
+ expCount = doc.getInteger("expCount");
+ }
+ List<String> countList = new ArrayList<>();
- List<Document> dList1 = new ArrayList<>(2);
- dList1.add(new Document("lalType", new Document("$eq", 1)));
- setTag(params, dList1);
- List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("lalType", new Document("$eq", 2)));
- setTag(params, dList2);
- List<Document> dList3 = new ArrayList<>(2);
- dList3.add(new Document("lalType", new Document("$eq", 3)));
- setTag(params, dList3);
- List<Document> dList4 = new ArrayList<>(2);
- dList4.add(new Document("lalType", new Document("$eq", 4)));
- setTag(params, dList4);
- Document ipErrFilter = new Document("$and", dList1);
- Document macdzErrFilter = new Document("$and", dList2);
- Document latitudeErrFilter = new Document("$and", dList3);
- Document longitudeErrFilter = new Document("$and", dList4);
-
- List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter);
- List<String> rList = lists.stream().map(filter -> {
- // 鏋勫缓鑱氬悎绠￠亾
- List<Document> pipeline = Arrays.asList(
- new Document("$match", filter),
- // $group 鍘婚噸
- new Document("$group", new Document("_id", "$externalIndexCode")),
- new Document("$count", "uniqueDeviceIds")
- );
- // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
- AggregateIterable<Document> result = collection.aggregate(pipeline);
- Integer uniqueDeviceIdCount = 0;
- for (Document doc : result) {
- uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds");
- break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋�
- }
- return uniqueDeviceIdCount + "";
- }).collect(Collectors.toList());
-
- Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFacePictureQualification)
.eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2293,10 +2508,12 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
- rList.add(this.remove0(onlineRate));
+ countList.add(sampleCount+"");
+ countList.add(expCount+"");
+ countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", rList);
- map.put("list", resultList);
+ map.put("count", countList);
+ map.put("list", voList);
return Result.ok().data(map).total(total);
}
@@ -2310,29 +2527,47 @@
public Result faceCapturesImagesAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ if(params.getOption()!=null){
+ //褰撴棩鏃堕挓寮傚父
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("majorDiffCount").gt(0));
+ }else if(params.getOption()==-1){
+ //鍏ㄩ儴鏃堕挓寮傚父
+ query.addCriteria(Criteria.where("importantDiffCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
+ List<SnapClockVO> resultVos = new ArrayList<>();
+ resultList.forEach(item->{
+ SnapClockVO vo = FaceDeviceInspectionResult.getVO(item);
+ resultVos.add(vo);
+ });
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
+ MongoCollection<Document> collection = database.getCollection("hk_face_device_inspection");
List<Document> dList1 = new ArrayList<>(2);
- dList1.add(new Document("snapResult", new Document("$eq", 1)));
+ dList1.add(new Document("snapClock.todayClockResult", new Document("$eq", 1)));
setTag(params, dList1);
List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("snapResult", new Document("$eq", 2)));
+ dList2.add(new Document("snapClock.todayClockResult", new Document("$eq", 0)));
setTag(params, dList2);
List<Document> dList3 = new ArrayList<>(2);
- dList3.add(new Document("snapResult", new Document("$eq", 4)));
+ dList3.add(new Document("snapClock.allClockResult", new Document("$eq", 1)));
setTag(params, dList3);
- Document ipErrFilter = new Document("$and", dList1);
- Document macdzErrFilter = new Document("$and", dList2);
- Document longitudeErrFilter = new Document("$and", dList3);
+ List<Document> dList4 = new ArrayList<>(2);
+ dList4.add(new Document("snapClock.allClockResult", new Document("$eq", 0)));
+ setTag(params, dList4);
+ Document todayFilter = new Document("$and", dList1);
+ Document todayErrFilter = new Document("$and", dList2);
+ Document allFilter = new Document("$and", dList3);
+ Document allErrFilter = new Document("$and", dList4);
- List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
+
+ List<Document> lists = Arrays.asList(todayFilter, todayErrFilter, allFilter,allErrFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -2351,11 +2586,11 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFaceTimingAccuracy)
.eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2366,7 +2601,7 @@
rList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", rList);
- map.put("list", resultList);
+ map.put("list", resultVos);
return Result.ok().data(map).total(total);
}
@@ -2380,29 +2615,34 @@
public Result faceTimelyUpload(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
- long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class);
+ query.addCriteria(Criteria.where("dataType").is(ApiConstants.HK_DataType_FACE));
+ if(params.getOption()!=null){
+ //姝ｅ父
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("delayCount").is(0));
+ }else if(params.getOption()==-1){
+ //寤惰繜
+ query.addCriteria(Criteria.where("delayCount").gt(0));
+ }
+ }
+ long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
- List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
-
- // 缁熻鏁伴噺
+ List<SnapshotDelayMonitorResult> resultList = mongoTemplate.find(query, SnapshotDelayMonitorResult.class);
+ // 缁熻鏁�
MongoDatabase database = mongoTemplate.getDb();
- MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection");
+ MongoCollection<Document> collection = database.getCollection("hk_snapshop_delay_monitor");
List<Document> dList1 = new ArrayList<>(2);
- dList1.add(new Document("snapResult", new Document("$eq", 1)));
setTag(params, dList1);
+ dList1.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_FACE)));
+ Document allFilter = new Document("$and", dList1);
List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("snapResult", new Document("$eq", 2)));
+ dList2.add(new Document("dataType" ,new Document("$eq",ApiConstants.HK_DataType_FACE)));
+ dList2.add(new Document("delayCount", new Document("$gt", 0)));
setTag(params, dList2);
- List<Document> dList3 = new ArrayList<>(2);
- dList3.add(new Document("snapResult", new Document("$eq", 4)));
- setTag(params, dList3);
- Document ipErrFilter = new Document("$and", dList1);
- Document macdzErrFilter = new Document("$and", dList2);
- Document longitudeErrFilter = new Document("$and", dList3);
+ Document delayFilter = new Document("$and", dList2);
- List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter);
+ List<Document> lists = Arrays.asList(allFilter,delayFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -2421,11 +2661,12 @@
return uniqueDeviceIdCount + "";
}).collect(Collectors.toList());
- Date now = new Date();
+
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFaceUploadTimeliness)
.eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2450,17 +2691,50 @@
public Result faceAvailabilityOfLargeImg(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName");
Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null);
-
+ if(params.getOption()!=null){
+ if(params.getOption()==1){
+ query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").is(0));
+ }else if(params.getOption()==-1){
+ query.addCriteria(Criteria.where("bigUseful.bigPicExpCount").gt(0));
+ }
+ }
long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class);
MongoUtil.setPage(query, params, TIME_FIELD);
+ query.with(Sort.by(Sort.Order.desc("bigUseful.bigPicExpCount")));
List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+ List<BigPicUsefulVO> voList = new ArrayList<>();
+ resultList.forEach(item->{
+ BigPicUsefulVO picVO = FaceDeviceSamplingResult.getPicVO(item);
+ voList.add(picVO);
+ });
+ // 缁熻鏁�
+ MongoDatabase database = mongoTemplate.getDb();
+ MongoCollection<Document> collection = database.getCollection("hk_face_device_sampling");
+ // 鏋勫缓鍩烘湰鐨�$match鏉′欢
+ List<Document> matchConditions = new ArrayList<>();
+ setTag(params, matchConditions);
+ List<Document> pipeline = Arrays.asList(
+ new Document("$match", new Document("$and", matchConditions)),
+ new Document("$group", new Document("_id", "$mongoCreateTime")
+ .append("sampleCount", new Document("$sum", "$bigUseful.sampleCount"))
+ .append("expCount", new Document("$sum", "$bigUseful.bigPicExpCount"))
+ ));
+ // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋�
+ AggregateIterable<Document> result = collection.aggregate(pipeline);
+ int sampleCount = 0;
+ int expCount = 0;
+ for (Document doc : result) {
+ sampleCount = doc.getInteger("sampleCount");
+ expCount = doc.getInteger("expCount");
+ }
+ List<String> countList = new ArrayList<>();
// 缁熻鏁�
- Date now = new Date();
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getFacePictureAvailability)
.eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now))
+ .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -2468,10 +2742,12 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
-
+ countList.add(sampleCount+"");
+ countList.add(expCount+"");
+ countList.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(this.remove0(onlineRate)));
- map.put("list", resultList);
+ map.put("count", countList);
+ map.put("list", voList);
return Result.ok().data(map).total(total);
}
--
Gitblit v1.8.0