From 3b146767b38a6bde685867143d397b5ece3339ea Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 05 九月 2024 21:34:44 +0800 Subject: [PATCH] 率 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 387 ++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 294 insertions(+), 93 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 c1672df..39fb39a 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 @@ -7,18 +7,13 @@ import com.mongodb.client.AggregateIterable; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import com.ycl.platform.domain.entity.CheckIndexVideo; -import com.ycl.platform.domain.entity.ImageResourceSecurityDetail; -import com.ycl.platform.domain.entity.YwPoint; +import com.ycl.platform.domain.entity.*; import com.ycl.platform.domain.query.DataCenterQuery; import com.ycl.platform.domain.result.HK.*; import com.ycl.platform.domain.result.UY.*; import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper; import com.ycl.platform.mapper.YwPointMapper; -import com.ycl.platform.service.DataCenterService; -import com.ycl.platform.service.ICheckIndexCarService; -import com.ycl.platform.service.ICheckIndexVideoService; -import com.ycl.platform.service.YwPointService; +import com.ycl.platform.service.*; import com.ycl.system.Result; import com.ycl.system.page.PageUtil; import com.ycl.utils.DateUtils; @@ -52,6 +47,8 @@ private final ImageResourceSecurityDetailMapper securityDetailMapper; private final YwPointMapper pointMapper; private final ICheckIndexVideoService checkIndexVideoService; + private final ICheckIndexCarService checkIndexCarService; + private final ICheckIndexFaceService checkIndexFaceService; private final static String TIME_FIELD = "mongoCreateTime"; @@ -66,7 +63,7 @@ public Result videoPointOnlineRate(DataCenterQuery params) { // 鐢熸垚鏌ヨ List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); // 鍏堟煡鎬绘暟鍐嶅垎椤� long total = mongoTemplate.count(query, VideoOnlineResult.class); @@ -102,11 +99,10 @@ */ @Override 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, likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 1); // 鍏堟煡鎬绘暟鍐嶅垎椤� long total = mongoTemplate.count(query, VideoOnlineResult.class); @@ -116,7 +112,7 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); + Document filter = new Document("deptTag", new Document("$eq", Boolean.TRUE)); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( // 鍙閮ㄧ骇鐨� @@ -157,10 +153,8 @@ */ @Override public Result videoImportantPointOnlineRate(DataCenterQuery params) { - // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣 - List<String> deptGBList = pointMapper.getDeptPointGB(1); List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 3); long total = mongoTemplate.count(query, VideoOnlineResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -169,7 +163,7 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); + Document filter = new Document("importantTag", new Document("$eq", Boolean.TRUE)); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -210,10 +204,8 @@ */ @Override public Result videoImportantPointImageOnlineRate(DataCenterQuery params) { - // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣 - List<String> deptGBList = pointMapper.getDeptPointGB(2); List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 4); long total = mongoTemplate.count(query, VideoOnlineResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -222,7 +214,7 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); + Document filter = new Document("importantCommandImageTag", new Document("$eq", Boolean.TRUE)); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -264,7 +256,7 @@ @Override public Result videoOneMachineDocumentRegister(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -325,7 +317,7 @@ @Override public Result videoOneMachineDocumentQualified(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -387,7 +379,7 @@ public Result videoAssessmentFileRatio(DataCenterQuery params) { // TODO 鏂板涓�寮犺〃璁板綍姣忔鐨勬。妗堣�冩牳 List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -437,7 +429,7 @@ @Override public Result videoAvailabilityRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, null); + Query query = MongoUtil.getQuery(params,"createTime", likeFileds, null); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); MongoUtil.setPage(query, params, "createTime"); @@ -492,10 +484,8 @@ */ @Override public Result deptVideoAvailabilityRate(DataCenterQuery params) { - - List<String> deptGBList = pointMapper.getDeptPointGB(0); List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 1); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); MongoUtil.setPage(query, params, "createTime"); @@ -507,7 +497,7 @@ List<Integer> status = Arrays.asList(1, 0, -1); List<String> resultCount = status.stream().map(item -> { Document filter = new Document("$and", Arrays.asList( - new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 + new Document("deptTag", new Document("$eq", Boolean.TRUE)), new Document("recordStatus", item) )); // 鏋勫缓鑱氬悎绠¢亾 @@ -553,10 +543,8 @@ */ @Override public Result videoImportantPointAvailabilityRate(DataCenterQuery params) { - - List<String> deptGBList = pointMapper.getDeptPointGB(1); List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "deviceId", "createTime", likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params,"createTime", likeFileds, 3); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); MongoUtil.setPage(query, params, "createTime"); @@ -568,7 +556,7 @@ List<Integer> status = Arrays.asList(1, 0, -1); List<String> resultCount = status.stream().map(item -> { Document filter = new Document("$and", Arrays.asList( - new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 + new Document("importantTag", new Document("$eq", Boolean.TRUE)), new Document("recordStatus", item) )); // 鏋勫缓鑱氬悎绠¢亾 @@ -615,7 +603,7 @@ @Override public Result videoLabelingAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class); @@ -639,10 +627,8 @@ */ @Override public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) { - - List<String> deptGBList = pointMapper.getDeptPointGB(1); List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); - Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3); long total = mongoTemplate.count(query, OsdCheckResult.class); MongoUtil.setPage(query, params, "checkTime"); @@ -652,10 +638,11 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("osd_check_result"); - Document osdNameFilter = new Document("osdNameCorrect", 1); - Document osdNameErrFilter = new Document("osdNameCorrect", -1); - Document osdTimeFilter = new Document("osdTimeCorrect", 1); - Document osdTimeErrFilter = new Document("osdTimeCorrect", -1); + Document importantTag = new Document("importantTag", Boolean.TRUE); + Document osdNameFilter = new Document("$and", Arrays.asList(new Document("osdNameCorrect", 1), importantTag)); + Document osdNameErrFilter = new Document("$and", Arrays.asList(new Document("osdNameCorrect", -1), importantTag)); + Document osdTimeFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", 1), importantTag)); + Document osdTimeErrFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", -1), importantTag)); List<Document> lists = Arrays.asList(osdNameFilter, osdNameErrFilter, osdTimeFilter, osdTimeErrFilter); List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 @@ -703,7 +690,7 @@ public Result videoCheckTimeAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, OneMachineFileResult.class); List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class); @@ -728,9 +715,8 @@ @Override public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) { - List<String> deptGBList = pointMapper.getDeptPointGB(1); List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); - Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3); long total = mongoTemplate.count(query, OsdCheckResult.class); MongoUtil.setPage(query, params, "checkTime"); @@ -740,8 +726,9 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("osd_check_result"); - Document osdTimeFilter = new Document("osdTimeCorrect", 1); - Document osdTimeErrFilter = new Document("osdTimeCorrect", -1); + Document importantTag = new Document("importantTag", Boolean.TRUE); + Document osdTimeFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", 1), importantTag)); + Document osdTimeErrFilter = new Document("$and", Arrays.asList(new Document("osdTimeCorrect", -1), importantTag)); List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter); List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 @@ -789,7 +776,7 @@ @Override public Result vehicleViewDockStable(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -804,7 +791,7 @@ 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<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -819,9 +806,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getViewConnectStability) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -837,7 +836,7 @@ @Override public Result vehiclePointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -848,8 +847,19 @@ MongoCollection<Document> collection = database.getCollection("hk_snapshot_data_monitor"); long distinctCount = collection.distinct("externalIndexCode", String.class).into(new ArrayList<>()).size(); + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getSiteOnline) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(distinctCount)); + map.put("count", Arrays.asList(distinctCount + "%", onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -863,7 +873,7 @@ @Override public Result vehicleNetDeviceDirectoryConsistency(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("ip.showValue", "name.showValue", "serialNumber.showValue"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -879,7 +889,7 @@ Document longitudeErrFilter = new Document("longitude.error", true); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -894,9 +904,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + "%"; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getDeviceDirectoryConsistent) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -912,7 +934,7 @@ @Override public Result vehicleCollectionConsistency(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, CrossDetailResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -928,7 +950,7 @@ Document longitudeErrFilter = new Document("lalType", 4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -943,9 +965,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getVehicleInformationCollectionAccuracy) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -961,7 +995,7 @@ @Override public Result vehicleCollectionDataIntegrity(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -971,8 +1005,20 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("hk_data_integrity_monitoring"); + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getVehicleCaptureIntegrity) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureIntegrity).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + HashMap<String, Object> map = new HashMap<>(); - map.put("count", CollectionUtils.EMPTY_COLLECTION); + map.put("count", Arrays.asList(onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -986,14 +1032,25 @@ @Override public Result vehicleCollectionDataCaptured(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); 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(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getVehicleCaptureAccuracy) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleCaptureAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", CollectionUtils.EMPTY_COLLECTION); + map.put("count", Arrays.asList(onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1007,7 +1064,7 @@ @Override public Result vehicleClockAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, VehicleDeviceInspectionResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1023,7 +1080,7 @@ Document longitudeErrFilter = new Document("snapResult", 4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1038,9 +1095,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getVehicleTimingAccuracy) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1056,14 +1125,26 @@ @Override public Result vehicleTimelyUploadAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); 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(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getVehicleUploadTimeliness) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", CollectionUtils.EMPTY_COLLECTION); + map.put("count", Arrays.asList(onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1077,14 +1158,26 @@ @Override public Result vehicleUrlAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, PicAccessResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<PicAccessResult> resultList = mongoTemplate.find(query, PicAccessResult.class); + // 缁熻鏁� + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getVehicleUrlAvailability) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehicleUrlAvailability).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", CollectionUtils.EMPTY_COLLECTION); + map.put("count", Arrays.asList(onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1098,14 +1191,26 @@ @Override public Result vehicleBigImgAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, VehicleDeviceSamplingResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<VehicleDeviceSamplingResult> resultList = mongoTemplate.find(query, VehicleDeviceSamplingResult.class); + // 缁熻鏁� + Date now = new Date(); + List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper()) + .select(CheckIndexCar::getVehiclePictureAvailability) + .between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexCar::getVehiclePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", CollectionUtils.EMPTY_COLLECTION); + map.put("count", Arrays.asList(onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1119,7 +1224,7 @@ @Override public Result faceViewDockStable(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1134,7 +1239,7 @@ 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<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1149,9 +1254,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getViewConnectStability) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getViewConnectStability).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1167,7 +1284,7 @@ @Override public Result facePointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1182,7 +1299,7 @@ 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<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1197,9 +1314,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getSiteOnline) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1215,7 +1344,7 @@ @Override public Result faceDirectoryConsistency(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("serialNumber.showValue", "ip.showValue", "name.showValue"); - Query query = MongoUtil.getQuery(params, "serialNumber.showValue", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitorQualifyResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1231,7 +1360,7 @@ Document longitudeErrFilter = new Document("longitude.error", true); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1246,9 +1375,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getDeviceDirectoryConsistent) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getDeviceDirectoryConsistent).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1264,7 +1405,7 @@ @Override public Result faceCollectionConsistency(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "crossName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, CrossDetailResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1280,7 +1421,7 @@ Document longitudeErrFilter = new Document("lalType", 4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1295,9 +1436,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getFaceInformationCollectionAccuracy) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceInformationCollectionAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1313,7 +1466,7 @@ @Override public Result faceImgQualification(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "cameraName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, MonitoringDetailResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1329,7 +1482,7 @@ Document longitudeErrFilter = new Document("lalType", 4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1344,9 +1497,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getFacePictureQualification) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureQualification).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1362,7 +1527,7 @@ @Override public Result faceCapturesImagesAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1377,7 +1542,7 @@ Document longitudeErrFilter = new Document("snapResult", 4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1392,9 +1557,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getFaceTimingAccuracy) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1410,7 +1587,7 @@ @Override public Result faceTimelyUpload(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, FaceDeviceInspectionResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1425,7 +1602,7 @@ Document longitudeErrFilter = new Document("snapResult", 4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1440,9 +1617,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getFaceUploadTimeliness) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getFaceUploadTimeliness).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1458,14 +1647,26 @@ @Override public Result faceAvailabilityOfLargeImg(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, FaceDeviceSamplingResult.class); MongoUtil.setPage(query, params, TIME_FIELD); List<FaceDeviceSamplingResult> resultList = mongoTemplate.find(query, FaceDeviceSamplingResult.class); + // 缁熻鏁� + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getFacePictureAvailability) + .between(CheckIndexFace::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexFace::getFacePictureAvailability).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", CollectionUtils.EMPTY_COLLECTION); + map.put("count", Arrays.asList(onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } -- Gitblit v1.8.0