From 46b29175dfdafafd014212be0e340544b8761493 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 05 九月 2024 21:52:06 +0800 Subject: [PATCH] 考核结果导出优化 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 412 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 305 insertions(+), 107 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 9038beb..f40c430 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 @@ -57,7 +57,8 @@ @Override public Result videoPointOnlineRate(DataCenterQuery params) { // 鐢熸垚鏌ヨ - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); + Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); // 鍏堟煡鎬绘暟鍐嶅垎椤� long total = mongoTemplate.count(query, VideoOnlineResult.class); @@ -85,9 +86,9 @@ public Result deptVideoPointOnlineRate(DataCenterQuery params) { // 鍏堟煡鍑洪儴绾х偣浣嶇殑鍥芥爣 List<String> deptGBList = pointMapper.getDeptPointGB(0); - + List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); // 鐢熸垚鏌ヨ - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList); + Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); // 鍏堟煡鎬绘暟鍐嶅垎椤� long total = mongoTemplate.count(query, VideoOnlineResult.class); @@ -130,8 +131,8 @@ public Result videoImportantPointOnlineRate(DataCenterQuery params) { // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣 List<String> deptGBList = pointMapper.getDeptPointGB(1); - - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList); + List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); + Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); long total = mongoTemplate.count(query, VideoOnlineResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -177,8 +178,8 @@ public Result videoImportantPointImageOnlineRate(DataCenterQuery params) { // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣 List<String> deptGBList = pointMapper.getDeptPointGB(2); - - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, deptGBList); + List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); + Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); long total = mongoTemplate.count(query, VideoOnlineResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -223,8 +224,8 @@ */ @Override public Result videoOneMachineDocumentRegister(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); + Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -272,8 +273,8 @@ */ @Override public Result videoOneMachineDocumentQualified(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); + Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -322,7 +323,8 @@ @Override public Result videoAssessmentFileRatio(DataCenterQuery params) { // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳 - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); + Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -370,8 +372,8 @@ */ @Override public Result videoAvailabilityRate(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "deviceId", "createTime", null); + List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); + Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, null); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); MongoUtil.setPage(query, params, "createTime"); @@ -417,8 +419,8 @@ public Result deptVideoAvailabilityRate(DataCenterQuery params) { List<String> deptGBList = pointMapper.getDeptPointGB(0); - - Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList); + List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); + Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); MongoUtil.setPage(query, params, "createTime"); @@ -467,8 +469,8 @@ public Result videoImportantPointAvailabilityRate(DataCenterQuery params) { List<String> deptGBList = pointMapper.getDeptPointGB(1); - - Query query = MongoUtil.getQuery(params, "deviceId", "createTime", deptGBList); + List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); + Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); MongoUtil.setPage(query, params, "createTime"); @@ -514,8 +516,8 @@ */ @Override public Result videoLabelingAccuracy(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>()); + List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); + Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class); @@ -541,7 +543,8 @@ public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) { List<String> deptGBList = pointMapper.getDeptPointGB(1); - Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList); + List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); + Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList); long total = mongoTemplate.count(query, OsdCheckResult.class); MongoUtil.setPage(query, params, "checkTime"); @@ -590,7 +593,8 @@ @Override public Result videoCheckTimeAccuracy(DataCenterQuery params) { - Query query = MongoUtil.getQuery(params, "deviceId", "", new ArrayList<>()); + List<String> likeFileds = Arrays.asList("deviceId"); + Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, OneMachineFileResult.class); List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class); @@ -616,8 +620,8 @@ public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) { List<String> deptGBList = pointMapper.getDeptPointGB(1); - - Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", deptGBList); + List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); + Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList); long total = mongoTemplate.count(query, OsdCheckResult.class); MongoUtil.setPage(query, params, "checkTime"); @@ -663,8 +667,8 @@ */ @Override public Result vehicleViewDockStable(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -711,8 +715,8 @@ */ @Override public Result vehiclePointOnlineRate(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -737,8 +741,8 @@ */ @Override public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -786,8 +790,8 @@ */ @Override public Result vehicleCollectionConsistency(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, CrossDetailResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -835,13 +839,17 @@ */ @Override public Result vehicleCollectionDataIntegrity(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<DataIntegrityMonitoringResult> resultList = mongoTemplate.find(query, DataIntegrityMonitoringResult.class); - // 缁熻鏁� + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_data_integrity_monitoring"); + HashMap<String, Object> map = new HashMap<>(); map.put("count", CollectionUtils.EMPTY_COLLECTION); map.put("list", resultList); @@ -856,8 +864,8 @@ */ @Override public Result vehicleCollectionDataCaptured(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, AttrRecognitionMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -877,18 +885,43 @@ */ @Override public Result vehicleClockAccuracy(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<VehicleDeviceInspectionResult> resultList = mongoTemplate.find(query, VehicleDeviceInspectionResult.class); - // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), VehicleDeviceInspectionResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), VehicleDeviceInspectionResult.class); - long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), VehicleDeviceInspectionResult.class); + + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection"); + + Document ipErrFilter = new Document("snapResult", 1); + Document macdzErrFilter = new Document("snapResult", 2); + Document longitudeErrFilter = new Document("snapResult", 4); + + List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(one, two, four)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -901,8 +934,8 @@ */ @Override public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDelayMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -922,8 +955,8 @@ */ @Override public Result vehicleUrlAccuracy(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, PicAccessResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -943,8 +976,8 @@ */ @Override public Result vehicleBigImgAccuracy(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, new ArrayList<>()); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -964,19 +997,42 @@ */ @Override public Result faceViewDockStable(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class); - // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class); - long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class); - long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class); + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor"); + + Document normalFilter = new Document("resultType", 1); + Document noDataFilter = new Document("resultType", 2); + Document trFilter = new Document("resultType", 3); + Document littleFilter = new Document("resultType", 4); + List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(one, two, three, four)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -989,19 +1045,42 @@ */ @Override public Result facePointOnlineRate(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class); - // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("1")), SnapshotDataMonitorResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("2")), SnapshotDataMonitorResult.class); - long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("3")), SnapshotDataMonitorResult.class); - long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("resultType").is("4")), SnapshotDataMonitorResult.class); + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor"); + + Document normalFilter = new Document("resultType", 1); + Document noDataFilter = new Document("resultType", 2); + Document trFilter = new Document("resultType", 3); + Document littleFilter = new Document("resultType", 4); + List<Document> lists = Arrays.asList(normalFilter, noDataFilter, trFilter, littleFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(one, two, three, four)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1014,20 +1093,43 @@ */ @Override public Result faceDirectoryConsistency(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue"); + Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<MonitorQualifyResult> resultList = mongoTemplate.find(query, MonitorQualifyResult.class); - // 缁熻鏁� - long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), MonitorQualifyResult.class); - long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), MonitorQualifyResult.class); - long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), MonitorQualifyResult.class); - long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), MonitorQualifyResult.class); - long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), MonitorQualifyResult.class); + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify"); + + Document ipErrFilter = new Document("ip.error", true); + Document macdzErrFilter = new Document("macdz.error", true); + Document latitudeErrFilter = new Document("latitude.error", true); + Document longitudeErrFilter = new Document("longitude.error", true); + + List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1040,19 +1142,43 @@ */ @Override public Result faceCollectionConsistency(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, CrossDetailResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<CrossDetailResult> resultList = mongoTemplate.find(query, CrossDetailResult.class); - // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), CrossDetailResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), CrossDetailResult.class); - long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), CrossDetailResult.class); - long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), CrossDetailResult.class); + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_cross_detail"); + + Document ipErrFilter = new Document("lalType", 1); + Document macdzErrFilter = new Document("lalType", 2); + Document latitudeErrFilter = new Document("lalType", 3); + Document longitudeErrFilter = new Document("lalType", 4); + + List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(one, two, three, four)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1065,19 +1191,43 @@ */ @Override public Result faceImgQualification(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitoringDetailResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<MonitoringDetailResult> resultList = mongoTemplate.find(query, MonitoringDetailResult.class); - // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("1")), MonitoringDetailResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("2")), MonitoringDetailResult.class); - long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("3")), MonitoringDetailResult.class); - long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("lalType").is("4")), MonitoringDetailResult.class); + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_monitoring_detail"); + + Document ipErrFilter = new Document("lalType", 1); + Document macdzErrFilter = new Document("lalType", 2); + Document latitudeErrFilter = new Document("lalType", 3); + Document longitudeErrFilter = new Document("lalType", 4); + + List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(one, two, three, four)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1090,18 +1240,42 @@ */ @Override public Result faceCapturesImagesAccuracy(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class); - // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class); - long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class); + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection"); + + Document ipErrFilter = new Document("snapResult", 1); + Document macdzErrFilter = new Document("snapResult", 2); + Document longitudeErrFilter = new Document("snapResult", 4); + + List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(one, two, four)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1114,18 +1288,42 @@ */ @Override public Result faceTimelyUpload(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<FaceDeviceInspectionResult> resultList = mongoTemplate.find(query, FaceDeviceInspectionResult.class); - // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("1")), FaceDeviceInspectionResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("2")), FaceDeviceInspectionResult.class); - long four = mongoTemplate.count(new Query().addCriteria(Criteria.where("snapResult").is("4")), FaceDeviceInspectionResult.class); + + // 缁熻鏁伴噺 + MongoDatabase database = mongoTemplate.getDb(); + MongoCollection<Document> collection = database.getCollection("hk_vehicle_device_inspection"); + + Document ipErrFilter = new Document("snapResult", 1); + Document macdzErrFilter = new Document("snapResult", 2); + Document longitudeErrFilter = new Document("snapResult", 4); + + List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter); + List<Integer> 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()); + HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(one, two, four)); + map.put("count", rList); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1138,8 +1336,8 @@ */ @Override public Result faceAvailabilityOfLargeImg(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, null); + List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); + Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class); MongoUtil.setPage(query, params, TIME_FIELD); -- Gitblit v1.8.0