From eb844dbc762cfbd65f027229a9fc43469aaf65d0 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 06 九月 2024 14:57:24 +0800 Subject: [PATCH] 考核模板定时任务getList分离 --- ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 906 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 739 insertions(+), 167 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java index c1672df..f7b2e36 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java @@ -7,22 +7,18 @@ import com.mongodb.client.AggregateIterable; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import com.ycl.platform.domain.entity.CheckIndexVideo; -import com.ycl.platform.domain.entity.ImageResourceSecurityDetail; -import com.ycl.platform.domain.entity.YwPoint; +import com.ycl.platform.domain.entity.*; import com.ycl.platform.domain.query.DataCenterQuery; import com.ycl.platform.domain.result.HK.*; import com.ycl.platform.domain.result.UY.*; import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper; import com.ycl.platform.mapper.YwPointMapper; -import com.ycl.platform.service.DataCenterService; -import com.ycl.platform.service.ICheckIndexCarService; -import com.ycl.platform.service.ICheckIndexVideoService; -import com.ycl.platform.service.YwPointService; +import com.ycl.platform.service.*; import com.ycl.system.Result; import com.ycl.system.page.PageUtil; import com.ycl.utils.DateUtils; import com.ycl.utils.MongoUtil; +import constant.CheckConstants; import lombok.RequiredArgsConstructor; import org.apache.commons.collections.CollectionUtils; import org.bson.Document; @@ -35,6 +31,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.*; import java.util.stream.Collectors; @@ -52,9 +49,13 @@ 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("#.####"); /** * 瑙嗛锛氱偣浣嶅湪绾跨巼 @@ -66,7 +67,7 @@ public Result videoPointOnlineRate(DataCenterQuery params) { // 鐢熸垚鏌ヨ List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); // 鍏堟煡鎬绘暟鍐嶅垎椤� long total = mongoTemplate.count(query, VideoOnlineResult.class); @@ -89,7 +90,7 @@ onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(distinctCount + "",onlineRate + "%")); + map.put("count", Arrays.asList(distinctCount + "",this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -102,11 +103,10 @@ */ @Override public Result deptVideoPointOnlineRate(DataCenterQuery params) { - // 鍏堟煡鍑洪儴绾х偣浣嶇殑鍥芥爣 - List<String> deptGBList = pointMapper.getDeptPointGB(0); + List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); // 鐢熸垚鏌ヨ - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 1); // 鍏堟煡鎬绘暟鍐嶅垎椤� long total = mongoTemplate.count(query, VideoOnlineResult.class); @@ -116,7 +116,12 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); + List<Document> dList = new ArrayList<>(2); + dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE))); + 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( // 鍙閮ㄧ骇鐨� @@ -135,6 +140,7 @@ 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; @@ -144,7 +150,7 @@ onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%")); + map.put("count", Arrays.asList(uniqueDeviceIdCount + "", this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -157,10 +163,8 @@ */ @Override public Result videoImportantPointOnlineRate(DataCenterQuery params) { - // 鍏堟煡鍑洪噸鐐圭偣浣嶇殑鍥芥爣 - List<String> deptGBList = pointMapper.getDeptPointGB(1); List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 3); long total = mongoTemplate.count(query, VideoOnlineResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -169,7 +173,13 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); + + List<Document> dList = new ArrayList<>(2); + dList.add(new Document("importantTag", new Document("$eq", Boolean.TRUE))); + 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), @@ -188,6 +198,7 @@ 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; @@ -197,7 +208,7 @@ onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%")); + map.put("count", Arrays.asList(uniqueDeviceIdCount + "", this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -210,10 +221,8 @@ */ @Override public Result videoImportantPointImageOnlineRate(DataCenterQuery params) { - // 鍏堟煡鍑洪噸鐐规寚鎸ュ浘鍍忕偣浣嶇殑鍥芥爣 - List<String> deptGBList = pointMapper.getDeptPointGB(2); List<String> likeFileds = Arrays.asList("arealayerName", "ipAddr", "deviceName", "deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, 4); long total = mongoTemplate.count(query, VideoOnlineResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -222,7 +231,13 @@ // 缁熻鏁伴噺 MongoDatabase database = mongoTemplate.getDb(); MongoCollection<Document> collection = database.getCollection("uy_online"); - Document filter = new Document("deviceId", new Document("$in", deptGBList)); + + List<Document> dList = new ArrayList<>(2); + dList.add(new Document("importantCommandImageTag", new Document("$eq", Boolean.TRUE))); + 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), @@ -241,6 +256,7 @@ 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; @@ -250,7 +266,7 @@ onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } HashMap<String, Object> map = new HashMap<>(); - map.put("count", Arrays.asList(uniqueDeviceIdCount + "", onlineRate + "%")); + map.put("count", Arrays.asList(uniqueDeviceIdCount + "", this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -264,7 +280,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); @@ -274,10 +290,30 @@ 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<String> rList = lists.stream().map(filter -> { @@ -301,6 +337,7 @@ 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; @@ -309,7 +346,7 @@ BigDecimal count = BigDecimal.valueOf(videoList.size()); onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } - rList.add(onlineRate + "%"); + rList.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -325,7 +362,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); @@ -335,10 +372,30 @@ 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<String> rList = lists.stream().map(filter -> { @@ -362,6 +419,7 @@ 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; @@ -370,7 +428,7 @@ BigDecimal count = BigDecimal.valueOf(videoList.size()); onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } - rList.add(onlineRate + "%"); + rList.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -387,7 +445,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); @@ -397,10 +455,30 @@ 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<String> rList = lists.stream().map(filter -> { @@ -437,7 +515,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"); @@ -448,7 +526,12 @@ MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); List<String> resultCount = status.stream().map(item -> { - Document filter = new Document("recordStatus", 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), @@ -469,6 +552,7 @@ 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; @@ -477,7 +561,7 @@ BigDecimal count = BigDecimal.valueOf(videoList.size()); onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } - resultCount.add(onlineRate + "%"); + resultCount.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -492,10 +576,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"); @@ -506,10 +588,13 @@ MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); List<String> resultCount = status.stream().map(item -> { - Document filter = new Document("$and", Arrays.asList( - new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 - new Document("recordStatus", 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), @@ -530,6 +615,7 @@ 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; @@ -538,7 +624,7 @@ BigDecimal count = BigDecimal.valueOf(videoList.size()); onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } - resultCount.add(onlineRate + "%"); + resultCount.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -553,10 +639,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"); @@ -567,10 +651,13 @@ MongoCollection<Document> collection = database.getCollection("uy_record_meta_d_sum"); List<Integer> status = Arrays.asList(1, 0, -1); List<String> resultCount = status.stream().map(item -> { - Document filter = new Document("$and", Arrays.asList( - new Document("deviceId", new Document("$in", deptGBList)), // $in 鏉′欢 - new Document("recordStatus", 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), @@ -591,6 +678,7 @@ 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; @@ -599,7 +687,7 @@ BigDecimal count = BigDecimal.valueOf(videoList.size()); onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } - resultCount.add(onlineRate + "%"); + resultCount.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", resultCount); map.put("list", resultList); @@ -615,7 +703,7 @@ @Override public Result videoLabelingAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceId", "deviceName"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, RecordMetaDSumResult.class); List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class); @@ -639,10 +727,8 @@ */ @Override public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) { - - List<String> deptGBList = pointMapper.getDeptPointGB(1); List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); - Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3); long total = mongoTemplate.count(query, OsdCheckResult.class); MongoUtil.setPage(query, params, "checkTime"); @@ -652,10 +738,34 @@ 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<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 @@ -678,6 +788,7 @@ 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; @@ -686,7 +797,7 @@ BigDecimal count = BigDecimal.valueOf(videoList.size()); onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } - rList.add(onlineRate + "%"); + rList.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -703,7 +814,7 @@ public Result videoCheckTimeAccuracy(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("deviceId"); - Query query = MongoUtil.getQuery(params, "deviceId", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, OneMachineFileResult.class); List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class); @@ -728,9 +839,8 @@ @Override public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) { - List<String> deptGBList = pointMapper.getDeptPointGB(1); List<String> likeFileds = Arrays.asList("deviceNo", "osdName"); - Query query = MongoUtil.getQuery(params, "deviceNo", "checkTime", likeFileds, deptGBList); + Query query = MongoUtil.getQuery(params,"checkTime", likeFileds, 3); long total = mongoTemplate.count(query, OsdCheckResult.class); MongoUtil.setPage(query, params, "checkTime"); @@ -740,8 +850,20 @@ 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<String> rList = lists.stream().map(filter -> { // 鏋勫缓鑱氬悎绠¢亾 @@ -764,6 +886,7 @@ 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; @@ -772,7 +895,7 @@ BigDecimal count = BigDecimal.valueOf(videoList.size()); onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)); } - rList.add(onlineRate + "%"); + rList.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -789,7 +912,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); @@ -799,12 +922,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), @@ -819,9 +966,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); @@ -837,7 +997,7 @@ @Override public Result vehiclePointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -848,8 +1008,20 @@ 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("count", Arrays.asList(distinctCount + "", this.remove0(onlineRate))); map.put("list", resultList); return Result.ok().data(map).total(total); } @@ -863,7 +1035,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); @@ -873,13 +1045,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), @@ -894,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::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); @@ -912,7 +1116,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); @@ -922,13 +1126,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), @@ -943,9 +1167,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); @@ -961,7 +1198,7 @@ @Override public Result vehicleCollectionDataIntegrity(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, DataIntegrityMonitoringResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -971,8 +1208,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); } @@ -986,14 +1236,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); } @@ -1007,7 +1269,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); @@ -1018,12 +1280,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), @@ -1038,9 +1315,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); @@ -1056,14 +1346,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); } @@ -1077,14 +1380,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); } @@ -1098,14 +1414,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); } @@ -1119,7 +1448,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); @@ -1129,12 +1458,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), @@ -1149,9 +1498,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); @@ -1167,7 +1529,7 @@ @Override public Result facePointOnlineRate(DataCenterQuery params) { List<String> likeFileds = Arrays.asList("externalIndexCode", "deviceName"); - Query query = MongoUtil.getQuery(params, "externalIndexCode", TIME_FIELD, likeFileds, null); + Query query = MongoUtil.getQuery(params, TIME_FIELD, likeFileds, null); long total = mongoTemplate.count(query, SnapshotDataMonitorResult.class); MongoUtil.setPage(query, params, TIME_FIELD); @@ -1177,12 +1539,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), @@ -1197,9 +1579,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::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)); + } + rList.add(this.remove0(onlineRate)); HashMap<String, Object> map = new HashMap<>(); map.put("count", rList); map.put("list", resultList); @@ -1215,7 +1610,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); @@ -1225,13 +1620,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), @@ -1246,9 +1660,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); @@ -1264,7 +1691,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); @@ -1274,13 +1701,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), @@ -1295,9 +1741,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); @@ -1313,7 +1772,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); @@ -1323,13 +1782,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), @@ -1344,9 +1823,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); @@ -1362,7 +1854,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); @@ -1372,12 +1864,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), @@ -1392,9 +1899,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); @@ -1410,7 +1930,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); @@ -1420,12 +1940,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), @@ -1440,9 +1975,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); @@ -1458,14 +2006,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); } @@ -1487,4 +2049,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