From 0ccc9a0dcadfb32aa8c63b718518ec0d216fae8f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 05 九月 2024 17:06:16 +0800 Subject: [PATCH] 保存到mongo时设置标签信息 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 319 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 222 insertions(+), 97 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 0f70896..c1672df 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 @@ -1,11 +1,13 @@ package com.ycl.platform.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; 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.query.DataCenterQuery; @@ -14,9 +16,12 @@ 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.system.Result; import com.ycl.system.page.PageUtil; +import com.ycl.utils.DateUtils; import com.ycl.utils.MongoUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; @@ -28,6 +33,8 @@ import org.springframework.data.mongodb.core.query.TextCriteria; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; @@ -44,6 +51,7 @@ private final MongoTemplate mongoTemplate; private final ImageResourceSecurityDetailMapper securityDetailMapper; private final YwPointMapper pointMapper; + private final ICheckIndexVideoService checkIndexVideoService; private final static String TIME_FIELD = "mongoCreateTime"; @@ -57,7 +65,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); @@ -68,9 +77,19 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_online"); long distinctCount = collection.distinct("deviceId", String.class).into(new ArrayList<>()).size(); - + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getSiteOnline) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getSiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(distinctCount)); + map.put("count", Arrays.asList(distinctCount + "",onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -85,9 +104,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); @@ -113,9 +132,19 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getMinistrySiteOnline) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistrySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(uniqueDeviceIdCount)); + map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -130,8 +159,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); @@ -156,13 +185,19 @@ break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } -// long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class); -// long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class); -// long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class); -// long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class); -// long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class); + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getKeySiteOnline) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeySiteOnline).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(uniqueDeviceIdCount)); + map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -177,8 +212,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); @@ -203,14 +238,19 @@ break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } -// // 缁熻鏁� -// long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class); -// long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class); -// long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), VideoOnlineResult.class); -// long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), VideoOnlineResult.class); -// long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), VideoOnlineResult.class); + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getKeyCommandImageOnline) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyCommandImageOnline).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(uniqueDeviceIdCount)); + map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%")); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -223,8 +263,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); @@ -240,7 +280,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), @@ -255,9 +295,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getMonitorRegistration) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorRegistration).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); @@ -272,8 +324,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); @@ -289,7 +341,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), @@ -304,9 +356,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getMonitorQualification) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMonitorQualification).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -322,7 +386,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); @@ -338,7 +403,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), @@ -353,9 +418,10 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + rList.add("0%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -370,8 +436,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"); @@ -381,7 +447,7 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); - List<Integer> resultCount = status.stream().map(item -> { + List<String> resultCount = status.stream().map(item -> { Document filter = new Document("recordStatus", item); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( @@ -397,10 +463,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); - + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getVideoAvailable) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + resultCount.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -417,8 +494,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"); @@ -428,7 +505,7 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); - List<Integer> resultCount = status.stream().map(item -> { + List<String> resultCount = status.stream().map(item -> { Document filter = new Document("$and", Arrays.asList( new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 new Document("recordStatus", item) @@ -447,10 +524,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); - + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getMinistryVideoAvailable) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getMinistryVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + resultCount.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -467,8 +555,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"); @@ -478,7 +566,7 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); - List<Integer> resultCount = status.stream().map(item -> { + List<String> resultCount = status.stream().map(item -> { Document filter = new Document("$and", Arrays.asList( new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 new Document("recordStatus", item) @@ -497,9 +585,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + "%"; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getKeyVideoAvailable) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyVideoAvailable).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + resultCount.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -514,8 +614,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 +641,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"); @@ -556,7 +657,7 @@ Document osdTimeFilter = new Document("osdTimeCorrect", 1); Document osdTimeErrFilter = new Document("osdTimeCorrect", -1); List<Document> lists = Arrays.asList(osdNameFilter, osdNameErrFilter, osdTimeFilter, osdTimeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -571,10 +672,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); - + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getKeyAnnotationAccuracy) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyAnnotationAccuracy).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); @@ -590,7 +702,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 +729,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"); @@ -630,7 +743,7 @@ Document osdTimeFilter = new Document("osdTimeCorrect", 1); Document osdTimeErrFilter = new Document("osdTimeCorrect", -1); List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -645,9 +758,21 @@ uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� } - return uniqueDeviceIdCount; + return uniqueDeviceIdCount + ""; }).collect(Collectors.toList()); + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getKeyTimingAccuracy) + .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(now), DateUtils.getDayEnd(now)) + .list(); + BigDecimal onlineRate = BigDecimal.ZERO; + if (CollectionUtils.isNotEmpty(videoList)) { + BigDecimal sum = videoList.stream().map(CheckIndexVideo::getKeyTimingAccuracy).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal count = BigDecimal.valueOf(videoList.size()); + onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); + } + rList.add(onlineRate + "%"); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -663,8 +788,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 +836,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 +862,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 +911,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,8 +960,8 @@ */ @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); @@ -860,8 +985,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); @@ -881,8 +1006,8 @@ */ @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); @@ -930,8 +1055,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); @@ -951,8 +1076,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); @@ -972,8 +1097,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); @@ -993,8 +1118,8 @@ */ @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); @@ -1041,8 +1166,8 @@ */ @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); @@ -1089,14 +1214,14 @@ */ @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); -// 缁熻鏁伴噺 + // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_monitor_qualify"); @@ -1138,8 +1263,8 @@ */ @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); @@ -1187,8 +1312,8 @@ */ @Override public Result faceImgQualification(DataCenterQuery params) { - - Query query = MongoUtil.getQuery(params, "externalIndexCode", 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); @@ -1236,8 +1361,8 @@ */ @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); @@ -1284,8 +1409,8 @@ */ @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); @@ -1332,8 +1457,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