From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 11 九月 2024 16:47:48 +0800 Subject: [PATCH] OSD加标签 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 1187 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 877 insertions(+), 310 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 f40c430..7d463d4 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,23 +1,25 @@ 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.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.domain.vo.PointDetailVO; import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper; import com.ycl.platform.mapper.YwPointMapper; -import com.ycl.platform.service.DataCenterService; -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; import com.ycl.utils.MongoUtil; +import constant.CheckConstants; import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; import org.bson.Document; @@ -28,6 +30,9 @@ import org.springframework.data.mongodb.core.query.TextCriteria; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -44,9 +49,14 @@ private final MongoTemplate mongoTemplate; 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"; + + private static DecimalFormat DF = new DecimalFormat("#.####"); /** * 瑙嗛锛氱偣浣嶅湪绾跨巼 @@ -56,24 +66,29 @@ */ @Override public Result videoPointOnlineRate(DataCenterQuery params) { - // 鐢熸垚鏌ヨ - List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); + params.setDeptTag(-1); + params.setDeviceType(1); + IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class); + pointMapper.dataCenterPage(page, params); - // 鍏堟煡鎬绘暟鍐嶅垎椤� - long total = mongoTemplate.count(query, VideoOnlineResult.class); - MongoUtil.setPage(query, params, TIME_FIELD); - List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class); + // 缁熻璁惧鏁伴噺 + Integer distinctCount = pointMapper.distinctCount(params); - // 缁熻鏁伴噺 - 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("list", resultList); - return Result.ok().data(map).total(total); + map.put("count", Arrays.asList(distinctCount + "",this.remove0(onlineRate))); + map.put("list", page.getRecords()); + return Result.ok().data(map).total(page.getTotal()); } /** @@ -84,41 +99,30 @@ */ @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); + params.setDeptTag(1); + params.setDeviceType(1); + IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class); + pointMapper.dataCenterPage(page, params); - // 鍏堟煡鎬绘暟鍐嶅垎椤� - long total = mongoTemplate.count(query, VideoOnlineResult.class); - MongoUtil.setPage(query, params, TIME_FIELD); - List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class); + // 缁熻璁惧鏁伴噺 + Integer distinctCount = pointMapper.distinctCount(params); - // 缁熻鏁伴噺 - MongoDatabase database = mongoTemplate.getDb(); - MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); - // 鏋勫缓鑱氬悎绠¢亾 - List<Document> pipeline = Arrays.asList( - // 鍙閮ㄧ骇鐨� - new Document("$match", filter), - // $group 鍘婚噸 - new Document("$group", new Document("_id", "$deviceId")), - new Document("$count", "uniqueDeviceIds") - ); - // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋� - AggregateIterable<Document> result = collection.aggregate(pipeline); - Integer uniqueDeviceIdCount = 0; - for (Document doc : result) { - uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); - break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getMinistrySiteOnline) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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("list", resultList); - return Result.ok().data(map).total(total); + map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate))); + map.put("list", page.getRecords()); + return Result.ok().data(map).total(page.getTotal()); } /** @@ -129,43 +133,30 @@ */ @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); + params.setDeptTag(3); + params.setDeviceType(1); + IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class); + pointMapper.dataCenterPage(page, params); - long total = mongoTemplate.count(query, VideoOnlineResult.class); - MongoUtil.setPage(query, params, TIME_FIELD); - List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class); + // 缁熻璁惧鏁伴噺 + Integer distinctCount = pointMapper.distinctCount(params); - // 缁熻鏁伴噺 - MongoDatabase database = mongoTemplate.getDb(); - MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); - // 鏋勫缓鑱氬悎绠¢亾 - List<Document> pipeline = Arrays.asList( - new Document("$match", filter), - // $group 鍘婚噸 - new Document("$group", new Document("_id", "$deviceId")), - new Document("$count", "uniqueDeviceIds") - ); - // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋� - AggregateIterable<Document> result = collection.aggregate(pipeline); - Integer uniqueDeviceIdCount = 0; - for (Document doc : result) { - uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); - break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getKeySiteOnline) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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)); } - -// 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); HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(uniqueDeviceIdCount)); - map.put("list", resultList); - return Result.ok().data(map).total(total); + map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate))); + map.put("list", page.getRecords()); + return Result.ok().data(map).total(page.getTotal()); } /** @@ -176,44 +167,30 @@ */ @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); + params.setDeptTag(4); + params.setDeviceType(1); + IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class); + pointMapper.dataCenterPage(page, params); - long total = mongoTemplate.count(query, VideoOnlineResult.class); - MongoUtil.setPage(query, params, TIME_FIELD); - List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class); + // 缁熻璁惧鏁伴噺 + Integer distinctCount = pointMapper.distinctCount(params); - // 缁熻鏁伴噺 - MongoDatabase database = mongoTemplate.getDb(); - MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); - // 鏋勫缓鑱氬悎绠¢亾 - List<Document> pipeline = Arrays.asList( - new Document("$match", filter), - // $group 鍘婚噸 - new Document("$group", new Document("_id", "$deviceId")), - new Document("$count", "uniqueDeviceIds") - ); - // 鎵ц鑱氬悎鏌ヨ骞惰幏鍙栫粨鏋� - AggregateIterable<Document> result = collection.aggregate(pipeline); - Integer uniqueDeviceIdCount = 0; - for (Document doc : result) { - uniqueDeviceIdCount = doc.getInteger("uniqueDeviceIds"); - break; // 涓嶉渶瑕佺户缁亶鍘嗭紝鍥犱负 $count 鍙細浜х敓涓�涓粨鏋� + Date now = new Date(); + List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper()) + .select(CheckIndexVideo::getKeyCommandImageOnline) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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)); } - -// // 缁熻鏁� -// 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); HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(uniqueDeviceIdCount)); - map.put("list", resultList); - return Result.ok().data(map).total(total); + map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate))); + map.put("list", page.getRecords()); + return Result.ok().data(map).total(page.getTotal()); } /** @@ -225,7 +202,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); @@ -235,13 +212,33 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -256,9 +253,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -274,7 +284,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); @@ -284,13 +294,33 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -305,9 +335,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -324,7 +367,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); @@ -334,13 +377,33 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -355,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); @@ -373,7 +437,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"); @@ -383,8 +447,13 @@ 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 -> { - Document filter = new Document("recordStatus", item); + List<String> resultCount = status.stream().map(item -> { + List<Document> dList = new ArrayList<>(2); + dList.add(new Document("recordStatus", new Document("$eq", item))); + if (params.getDataType().equals(1)) { + dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -399,10 +468,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -417,10 +498,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"); @@ -430,11 +509,14 @@ 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 -> { - Document filter = new Document("$and", Arrays.asList( - new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 - new Document("recordStatus", item) - )); + List<String> resultCount = status.stream().map(item -> { + List<Document> dList = new ArrayList<>(4); + dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE))); + dList.add(new Document("recordStatus", new Document("$eq", item))); + if (params.getDataType().equals(1)) { + dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -449,10 +531,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -467,10 +561,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"); @@ -480,11 +572,14 @@ 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 -> { - Document filter = new Document("$and", Arrays.asList( - new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 - new Document("recordStatus", item) - )); + List<String> resultCount = status.stream().map(item -> { + List<Document> dList = new ArrayList<>(4); + dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE))); + dList.add(new Document("recordStatus", new Document("$eq", item))); + if (params.getDataType().equals(1)) { + dList.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document filter = new Document("$and", dList); // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -499,9 +594,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -517,7 +625,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); @@ -541,10 +649,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"); @@ -554,12 +660,36 @@ 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); + List<Document> dList1 = new ArrayList<>(2); + dList1.add(new Document("importantTag", Boolean.TRUE)); + dList1.add(new Document("osdNameCorrect", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("importantTag", Boolean.TRUE)); + dList2.add(new Document("osdNameCorrect", new Document("$eq", -1))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("importantTag", Boolean.TRUE)); + dList3.add(new Document("osdTimeCorrect", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("importantTag", Boolean.TRUE)); + dList4.add(new Document("osdTimeCorrect", new Document("$eq", -1))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document osdNameFilter = new Document("$and", dList1); + Document osdNameErrFilter = new Document("$and", dList2); + Document osdTimeFilter = new Document("$and", dList3); + Document osdTimeErrFilter = new Document("$and", dList4); 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), @@ -574,10 +704,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -594,7 +736,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); @@ -619,9 +761,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"); @@ -631,10 +772,22 @@ MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("osd_check_result"); - Document osdTimeFilter = new Document("osdTimeCorrect", 1); - Document osdTimeErrFilter = new Document("osdTimeCorrect", -1); + List<Document> dList1 = new ArrayList<>(2); + dList1.add(new Document("importantTag", Boolean.TRUE)); + dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("importantTag", Boolean.TRUE)); + dList2.add(new Document("osdTimeCorrect", new Document("$eq", -1))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document osdTimeFilter = new Document("$and", dList1); + Document osdTimeErrFilter = new Document("$and", dList2); 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), @@ -649,9 +802,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -668,7 +834,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); @@ -678,12 +844,36 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("importantTag", Boolean.TRUE)); + dList1.add(new Document("resultType", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("importantTag", Boolean.TRUE)); + dList2.add(new Document("resultType", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("importantTag", Boolean.TRUE)); + dList3.add(new Document("resultType", new Document("$eq", 3))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("importantTag", Boolean.TRUE)); + dList4.add(new Document("resultType", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document normalFilter = new Document("$and", dList1); + Document noDataFilter = new Document("$and", dList2); + Document trFilter = new Document("$and", dList3); + Document littleFilter = new Document("$and", dList4); 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), @@ -698,9 +888,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -715,22 +918,30 @@ */ @Override public Result vehiclePointOnlineRate(DataCenterQuery params) { - List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + params.setDeptTag(-1); + params.setDeviceType(2); + IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class); + pointMapper.dataCenterPage(page, params); - long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); - MongoUtil.setPage(query, params, TIME_FIELD); - List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class); + // 缁熻璁惧鏁伴噺 + Integer distinctCount = pointMapper.distinctCount(params); - // 缁熻鏁伴噺 - MongoDatabase database = mongoTemplate.getDb(); - 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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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("list", resultList); - return Result.ok().data(map).total(total); + map.put("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate))); + map.put("list", page.getRecords()); + return Result.ok().data(map).total(page.getTotal()); } /** @@ -742,7 +953,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); @@ -752,13 +963,32 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -773,9 +1003,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -791,7 +1034,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); @@ -801,13 +1044,33 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("lalType", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("lalType", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("lalType", new Document("$eq", 3))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("lalType", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -822,9 +1085,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -840,7 +1116,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); @@ -850,8 +1126,21 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -865,14 +1154,26 @@ @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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -886,7 +1187,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); @@ -897,12 +1198,27 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("snapResult", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("snapResult", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("snapResult", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document longitudeErrFilter = new Document("$and", dList3); 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), @@ -917,9 +1233,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -935,14 +1264,27 @@ @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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -956,14 +1298,27 @@ @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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -977,14 +1332,27 @@ @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) + .eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -998,7 +1366,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); @@ -1008,12 +1376,32 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("resultType", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("resultType", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("resultType", new Document("$eq", 3))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("resultType", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document normalFilter = new Document("$and", dList1); + Document noDataFilter = new Document("$and", dList2); + Document trFilter = new Document("$and", dList3); + Document littleFilter = new Document("$and", dList4); 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), @@ -1028,9 +1416,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1045,44 +1446,33 @@ */ @Override public Result facePointOnlineRate(DataCenterQuery params) { - List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + params.setDeptTag(-1); + params.setDeviceType(3); + IPage<PointDetailVO> page = PageUtil.getPage(params, PointDetailVO.class); + pointMapper.dataCenterPage(page, params); - long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); - MongoUtil.setPage(query, params, TIME_FIELD); - List<SnapshotDataMonitorResult> resultList = mongoTemplate.find(query, SnapshotDataMonitorResult.class); + // 缁熻璁惧鏁伴噺 + Integer distinctCount = pointMapper.distinctCount(params); - // 缁熻鏁伴噺 - 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()); - + Date now = new Date(); + List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper()) + .select(CheckIndexFace::getSiteOnline) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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)); + } + List<String> rList = new ArrayList<>(2); + rList.add(distinctCount + ""); + rList.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); - map.put("list", resultList); - return Result.ok().data(map).total(total); + map.put("list", page.getRecords()); + return Result.ok().data(map).total(page.getTotal()); } /** @@ -1094,7 +1484,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); @@ -1104,13 +1494,32 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("ip.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("macdz.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("latitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("longitude.error", new Document("$eq", Boolean.TRUE))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1125,9 +1534,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1143,7 +1565,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); @@ -1153,13 +1575,32 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("lalType", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("lalType", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("lalType", new Document("$eq", 3))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("lalType", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1174,9 +1615,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1192,7 +1646,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); @@ -1202,13 +1656,33 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("lalType", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("lalType", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("lalType", new Document("$eq", 3))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList4 = new ArrayList<>(2); + dList4.add(new Document("lalType", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList4.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document latitudeErrFilter = new Document("$and", dList3); + Document longitudeErrFilter = new Document("$and", dList4); List<Document> lists = Arrays.asList(ipErrFilter, macdzErrFilter, latitudeErrFilter, longitudeErrFilter); - List<Integer> rList = lists.stream().map(filter -> { + List<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 List<Document> pipeline = Arrays.asList( new Document("$match", filter), @@ -1223,9 +1697,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1241,7 +1728,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); @@ -1251,12 +1738,27 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("snapResult", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("snapResult", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("snapResult", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document longitudeErrFilter = new Document("$and", dList3); 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), @@ -1271,9 +1773,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1289,7 +1804,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); @@ -1299,12 +1814,27 @@ 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> dList1 = new ArrayList<>(2); + dList1.add(new Document("snapResult", new Document("$eq", 1))); + if (params.getDataType().equals(1)) { + dList1.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList2 = new ArrayList<>(2); + dList2.add(new Document("snapResult", new Document("$eq", 2))); + if (params.getDataType().equals(1)) { + dList2.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + List<Document> dList3 = new ArrayList<>(2); + dList3.add(new Document("snapResult", new Document("$eq", 4))); + if (params.getDataType().equals(1)) { + dList3.add(new Document("provinceTag", new Document("$eq", Boolean.TRUE))); + } + Document ipErrFilter = new Document("$and", dList1); + Document macdzErrFilter = new Document("$and", dList2); + Document longitudeErrFilter = new Document("$and", dList3); 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), @@ -1319,9 +1849,22 @@ 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) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1337,14 +1880,28 @@ @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) + .eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province) + .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(this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -1366,4 +1923,14 @@ return Result.ok().data(map).total(page.getTotal()); } + + /** + * 鍒犻櫎灏鹃儴鐨�0 + * @param rate + * @return + */ + private String remove0(BigDecimal rate) { + DF.setDecimalSeparatorAlwaysShown(false); + return DF.format(rate) + "%"; + } } -- Gitblit v1.8.0