From edc45b1334b768aed6569baf6e12515868ad88ea Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 24 十月 2024 17:16:00 +0800
Subject: [PATCH] 工单联系人回显、流程图情况说明回显、数据中心OSD优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 389 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 255 insertions(+), 134 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 f0c00c6..c3a37f7 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
@@ -75,7 +75,7 @@
//鏌ヨ棰戣澶�
query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if(params.getOption()!=null) {
+ if (params.getOption() != null) {
query.addCriteria(Criteria.where("online").is(params.getOption()));
}
// 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
@@ -85,18 +85,18 @@
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
resultList.forEach(item -> {
- if(item.getPingOnline() ==null){
+ if (item.getPingOnline() == null) {
item.setPingOnlineStr("鏈煡");
} else if (item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- } else if(!item.getPingOnline()){
+ } else if (!item.getPingOnline()) {
item.setPingOnlineStr("绂荤嚎");
}
- if(1== item.getOnline() ){
+ if (1 == item.getOnline()) {
item.setOnlineStr("鍦ㄧ嚎");
- }else if(-1==item.getOnline()){
+ } else if (-1 == item.getOnline()) {
item.setOnlineStr("绂荤嚎");
- }else {
+ } else {
item.setOnlineStr("鏈煡");
}
});
@@ -104,10 +104,10 @@
params.setDeviceType(1);
//鍗＄墖缁熻
- int totalCount =0;
- int onlineCount =0;
- int offlineCount =0;
- int unknownCount =0;
+ int totalCount = 0;
+ int onlineCount = 0;
+ int offlineCount = 0;
+ int unknownCount = 0;
//鏋勫缓鏉′欢
List<Criteria> criteriaList = new ArrayList<>();
// 娣诲姞鍥哄畾鏉′欢
@@ -132,28 +132,18 @@
// 鎵ц鑱氬悎鏌ヨ
AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
- unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
/** 鏌ヨ褰撳ぉ鍦ㄧ嚎鐜� */
- // 鍒涘缓涓�涓猀ueryWrapper瀹炰緥
- QueryWrapper<CheckIndexVideo> queryWrapper = new QueryWrapper<>();
- queryWrapper.lambda().select(CheckIndexVideo::getSiteOnline) // 閫夋嫨瑕佹煡璇㈢殑瀛楁
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime()); // 璁剧疆鏃堕棿鑼冨洿鏉′欢
- if (params.getDataType() == 0) {
- //鍖哄幙
- queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_County);
- }else if(params.getDataType() == 1){
- //鐪佸巺
- queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province);
- }else if(params.getDataType() == 2){
- //鍏畨閮�
- queryWrapper.lambda().eq(CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept);
- }
- // 浣跨敤QueryWrapper鎵ц鏌ヨ
- List<CheckIndexVideo> videoList = checkIndexVideoService.getBaseMapper().selectList(queryWrapper);
+ List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
+ .select(CheckIndexVideo::getSiteOnline)
+ .eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+ .list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -162,7 +152,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+ map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -181,7 +171,7 @@
query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
query.addCriteria(Criteria.where("deptTag").is(Boolean.TRUE));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if(params.getOption()!=null) {
+ if (params.getOption() != null) {
query.addCriteria(Criteria.where("online").is(params.getOption()));
}
// 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
@@ -191,11 +181,11 @@
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
resultList.forEach(item -> {
- if(item.getPingOnline() ==null){
+ if (item.getPingOnline() == null) {
item.setPingOnlineStr("鏈煡");
} else if (item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- } else if(!item.getPingOnline()){
+ } else if (!item.getPingOnline()) {
item.setPingOnlineStr("绂荤嚎");
}
if (1 == item.getOnline()) {
@@ -208,10 +198,10 @@
});
// 缁熻璁惧鏁伴噺
//鍗＄墖缁熻
- int totalCount =0;
- int onlineCount =0;
- int offlineCount =0;
- int unknownCount =0;
+ int totalCount = 0;
+ int onlineCount = 0;
+ int offlineCount = 0;
+ int unknownCount = 0;
//鏋勫缓鏉′欢
List<Criteria> criteriaList = new ArrayList<>();
// 娣诲姞鍥哄畾鏉′欢
@@ -236,9 +226,9 @@
// 鎵ц鑱氬悎鏌ヨ
AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
- unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
@@ -247,7 +237,8 @@
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getMinistrySiteOnline)
.eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -256,7 +247,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+ map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -275,7 +266,7 @@
query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
query.addCriteria(Criteria.where("importantTag").is(Boolean.TRUE));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if(params.getOption()!=null) {
+ if (params.getOption() != null) {
query.addCriteria(Criteria.where("online").is(params.getOption()));
}
// 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
@@ -287,11 +278,11 @@
params.setDeptTag(3);
params.setDeviceType(1);
resultList.forEach(item -> {
- if(item.getPingOnline() ==null){
+ if (item.getPingOnline() == null) {
item.setPingOnlineStr("鏈煡");
} else if (item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- } else if(!item.getPingOnline()){
+ } else if (!item.getPingOnline()) {
item.setPingOnlineStr("绂荤嚎");
}
if (1 == item.getOnline()) {
@@ -305,10 +296,10 @@
// 缁熻璁惧鏁伴噺
//鍗＄墖缁熻
- int totalCount =0;
- int onlineCount =0;
- int offlineCount =0;
- int unknownCount =0;
+ int totalCount = 0;
+ int onlineCount = 0;
+ int offlineCount = 0;
+ int unknownCount = 0;
//鏋勫缓鏉′欢
List<Criteria> criteriaList = new ArrayList<>();
// 娣诲姞鍥哄畾鏉′欢
@@ -333,15 +324,16 @@
// 鎵ц鑱氬悎鏌ヨ
AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
- unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeySiteOnline)
.eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -350,7 +342,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+ map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -369,7 +361,7 @@
query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Video + ".*"));
query.addCriteria(Criteria.where("importantCommandImageTag").is(Boolean.TRUE));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if(params.getOption()!=null) {
+ if (params.getOption() != null) {
query.addCriteria(Criteria.where("online").is(params.getOption()));
}
// 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
@@ -382,11 +374,11 @@
params.setDeptTag(4);
params.setDeviceType(1);
resultList.forEach(item -> {
- if(item.getPingOnline() ==null){
+ if (item.getPingOnline() == null) {
item.setPingOnlineStr("鏈煡");
} else if (item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- } else if(!item.getPingOnline()){
+ } else if (!item.getPingOnline()) {
item.setPingOnlineStr("绂荤嚎");
}
if (1 == item.getOnline()) {
@@ -400,10 +392,10 @@
// 缁熻璁惧鏁伴噺
//鍗＄墖缁熻
- int totalCount =0;
- int onlineCount =0;
- int offlineCount =0;
- int unknownCount =0;
+ int totalCount = 0;
+ int onlineCount = 0;
+ int offlineCount = 0;
+ int unknownCount = 0;
//鏋勫缓鏉′欢
List<Criteria> criteriaList = new ArrayList<>();
// 娣诲姞鍥哄畾鏉′欢
@@ -428,16 +420,17 @@
// 鎵ц鑱氬悎鏌ヨ
AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
- unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
List<CheckIndexVideo> videoList = new LambdaQueryChainWrapper<>(checkIndexVideoService.getBaseMapper())
.select(CheckIndexVideo::getKeyCommandImageOnline)
.eq(params.getDataType().equals(1), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -446,7 +439,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+ map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -671,7 +664,10 @@
public Result videoAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
Query query = MongoUtil.getQuery(params, "createTime", likeFileds, null);
-
+ //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
+ if (params.getOption() != null) {
+ query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
+ }
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -701,12 +697,11 @@
}
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))
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -714,7 +709,15 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+ //鍔犱竴涓�绘暟
+ int totalCount = 0;
+ for (String s : resultCount) {
+ totalCount += Integer.parseInt(s);
+ }
+ resultCount.add(0, totalCount + "");
+
resultCount.add(this.remove0(onlineRate));
+
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
map.put("list", resultList);
@@ -731,7 +734,10 @@
public Result deptVideoAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 1);
-
+ //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
+ if (params.getOption() != null) {
+ query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
+ }
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -763,11 +769,11 @@
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))
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -775,6 +781,12 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+ //鍔犱竴涓�绘暟
+ int totalCount = 0;
+ for (String s : resultCount) {
+ totalCount += Integer.parseInt(s);
+ }
+ resultCount.add(0, totalCount + "");
resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
@@ -792,7 +804,10 @@
public Result videoImportantPointAvailabilityRate(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceId", "deviceName");
Query query = MongoUtil.getQuery(params, "createTime", likeFileds, 3);
-
+ //涓嬫媺妗嗗綍鍍忔儏鍐垫煡璇㈡潯浠�
+ if (params.getOption() != null) {
+ query.addCriteria(Criteria.where("recordStatus").is(params.getOption()));
+ }
long total = mongoTemplate.count(query, RecordMetaDSumResult.class);
MongoUtil.setPage(query, params, "createTime");
List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class);
@@ -824,11 +839,11 @@
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))
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -836,6 +851,12 @@
BigDecimal count = BigDecimal.valueOf(videoList.size());
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
+ //鍔犱竴涓�绘暟
+ int totalCount = 0;
+ for (String s : resultCount) {
+ totalCount += Integer.parseInt(s);
+ }
+ resultCount.add(0, totalCount + "");
resultCount.add(this.remove0(onlineRate));
HashMap<String, Object> map = new HashMap<>();
map.put("count", resultCount);
@@ -844,7 +865,7 @@
}
/**
- * 瑙嗛锛氭爣娉ㄦ纭巼
+ * 瑙嗛锛氭爣娉ㄦ纭巼锛堟殏鍋滐級
*
* @param params
* @return
@@ -877,37 +898,90 @@
@Override
public Result videoImportantPointLabelingAccuracy(DataCenterQuery params) {
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
- Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
-
+ List<Criteria> andCriteria = MongoUtil.getAndCriteria(params, "checkTime", likeFileds, 3);
+ Query query = new Query();
+ //涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
+ if (params.getOption() != null) {
+ if(params.getOption()==1) {
+ andCriteria.add(Criteria.where("osdNameCorrect").is(1));
+ andCriteria.add(Criteria.where("osdTimeCorrect").is(1));
+ andCriteria.add(Criteria.where("osdProvinceCorrect").is(1));
+ andCriteria.add(Criteria.where("osdCityCorrect").is(1));
+ andCriteria.add(Criteria.where("osdPartCorrect").is(1));
+ Criteria and = new Criteria();
+ and.andOperator(andCriteria);
+ query = Query.query(and);
+ }else if(params.getOption()==-1){
+ // 浣跨敤$or鏉′欢杩炴帴澶氫釜瀛楁妫�鏌ワ紝姣忎釜瀛楁妫�鏌ユ槸鍚︾瓑浜�-1
+ Criteria c1 = Criteria.where("osdNameCorrect").is(-1);
+ Criteria c2 = Criteria.where("osdTimeCorrect").is(-1);
+ Criteria c3 = Criteria.where("osdProvinceCorrect").is(-1);
+ Criteria c4 = Criteria.where("osdCityCorrect").is(-1);
+ Criteria c5 = Criteria.where("osdPartCorrect").is(-1);
+ Criteria orOperator = new Criteria().orOperator(c1, c2, c3, c4, c5);
+ orOperator.andOperator(andCriteria);
+ query = Query.query(orOperator);
+ }else {
+ Criteria c1 = Criteria.where("osdNameCorrect").is(0);
+ Criteria c2 = Criteria.where("osdTimeCorrect").is(0);
+ Criteria c3 = Criteria.where("osdProvinceCorrect").is(0);
+ Criteria c4 = Criteria.where("osdCityCorrect").is(0);
+ Criteria c5 = Criteria.where("osdPartCorrect").is(0);
+ Criteria orOperator = new Criteria().orOperator(c1, c2, c3, c4, c5);
+ orOperator.andOperator(andCriteria);
+ query = Query.query(orOperator);
+ }
+ }
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
-
+ for (OsdCheckResult osdCheckResult : resultList) {
+ OsdCheckResult.getText(osdCheckResult);
+ }
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("osd_check_result");
-
+ //鎬绘暟
+ List<Document> dList = new ArrayList<>(2);
+ dList.add(new Document("importantTag", Boolean.TRUE));
+ setTag(params, dList);
+ Document osdFilter = new Document("$and", dList);
+ //姝ｅ父鏁�
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("importantTag", Boolean.TRUE));
dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
+ dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+ dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1)));
+ dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
+ dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
setTag(params, dList1);
- List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("importantTag", Boolean.TRUE));
- dList2.add(new Document("osdNameCorrect", new Document("$eq", -1)));
- setTag(params, dList2);
- List<Document> dList3 = new ArrayList<>(2);
- dList3.add(new Document("importantTag", Boolean.TRUE));
- dList3.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
- setTag(params, dList3);
- List<Document> dList4 = new ArrayList<>(2);
- dList4.add(new Document("importantTag", Boolean.TRUE));
- dList4.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
- setTag(params, dList4);
- 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);
+ Document osdCorrectFilter = new Document("$and", dList1);
+ //寮傚父鏁�
+ Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
+ Document mongoCreateTimeRange = new Document()
+ .append("$gte", params.getStartTime())
+ .append("$lt", params.getEndTime());
+ Document mongoCreateTime = new Document("mongoCreateTime", mongoCreateTimeRange);
+ List<Document> errorConditions = new ArrayList<>();
+ errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdProvinceCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
+ Document errorFilter = new Document("$or", errorConditions);
+ Document osdErrorFilter = new Document("$and", Arrays.asList(importantTagCondition,mongoCreateTime, errorFilter));
+ //TODO锛氭湭鐭ユ暟 鏂板0鐨勭姸鎬�
+ List<Document> unknownConditions = new ArrayList<>();
+ unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
+ // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠�
+ Document unknownFilter = new Document("$or", unknownConditions);
+ Document osdUnknownFilter = new Document("$and", Arrays.asList(importantTagCondition, mongoCreateTime,unknownFilter));
+
+ List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter,osdUnknownFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -926,11 +1000,11 @@
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))
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -979,29 +1053,70 @@
*/
@Override
public Result videoImportantPointCheckTimeAccuracy(DataCenterQuery params) {
-
List<String> likeFileds = Arrays.asList("deviceNo", "osdName");
Query query = MongoUtil.getQuery(params, "checkTime", likeFileds, 3);
+ //涓嬫媺妗嗘爣娉ㄦ纭煡璇㈡潯浠�
+ if (params.getOption() != null) {
+ if(params.getOption()==1) {
+ query.addCriteria(Criteria.where("osdTimeCorrect").is(1));
+ }else if(params.getOption()==-1){
+ query.addCriteria(Criteria.where("osdTimeCorrect").is(-1));
+ }else {
+ query.addCriteria(Criteria.where("osdTimeCorrect").is(0));
+ }
+ }
long total = mongoTemplate.count(query, OsdCheckResult.class);
MongoUtil.setPage(query, params, "checkTime");
List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
+ for (OsdCheckResult osdCheckResult : resultList) {
+ OsdCheckResult.getText(osdCheckResult);
+ }
// 缁熻鏁伴噺
MongoDatabase database = mongoTemplate.getDb();
MongoCollection<Document> collection = database.getCollection("osd_check_result");
-
+ //鎬绘暟
+ List<Document> dList = new ArrayList<>(2);
+ dList.add(new Document("importantTag", Boolean.TRUE));
+ setTag(params, dList);
+ Document osdFilter = new Document("$and", dList);
+ //姝ｅ父鏁�
List<Document> dList1 = new ArrayList<>(2);
dList1.add(new Document("importantTag", Boolean.TRUE));
+ dList1.add(new Document("osdNameCorrect", new Document("$eq", 1)));
dList1.add(new Document("osdTimeCorrect", new Document("$eq", 1)));
+ dList1.add(new Document("osdProvinceCorrect", new Document("$eq", 1)));
+ dList1.add(new Document("osdCityCorrect", new Document("$eq", 1)));
+ dList1.add(new Document("osdPartCorrect", new Document("$eq", 1)));
setTag(params, dList1);
- List<Document> dList2 = new ArrayList<>(2);
- dList2.add(new Document("importantTag", Boolean.TRUE));
- dList2.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
- setTag(params, dList2);
- Document osdTimeFilter = new Document("$and", dList1);
- Document osdTimeErrFilter = new Document("$and", dList2);
- List<Document> lists = Arrays.asList(osdTimeFilter, osdTimeErrFilter);
+ Document osdCorrectFilter = new Document("$and", dList1);
+ //寮傚父鏁�
+ Document importantTagCondition = new Document("importantTag", Boolean.TRUE);
+ Document mongoCreateTimeRange = new Document()
+ .append("$gte", params.getStartTime())
+ .append("$lt", params.getEndTime());
+ Document mongoCreateTime = new Document("mongoCreateTime", mongoCreateTimeRange);
+ List<Document> errorConditions = new ArrayList<>();
+ errorConditions.add(new Document("osdNameCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdTimeCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdProvinceCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdCityCorrect", new Document("$eq", -1)));
+ errorConditions.add(new Document("osdPartCorrect", new Document("$eq", -1)));
+ Document errorFilter = new Document("$or", errorConditions);
+ Document osdErrorFilter = new Document("$and", Arrays.asList(importantTagCondition,mongoCreateTime, errorFilter));
+ //TODO锛氭湭鐭ユ暟 鏂板0鐨勭姸鎬�
+ List<Document> unknownConditions = new ArrayList<>();
+ unknownConditions.add(new Document("osdNameCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdTimeCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdProvinceCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdCityCorrect", new Document("$eq", 0)));
+ unknownConditions.add(new Document("osdPartCorrect", new Document("$eq", 0)));
+ // 浣跨敤$or閫昏緫缁勫悎鍓╀綑鐨勬潯浠�
+ Document unknownFilter = new Document("$or", unknownConditions);
+ Document osdUnknownFilter = new Document("$and", Arrays.asList(importantTagCondition, mongoCreateTime,unknownFilter));
+
+ List<Document> lists = Arrays.asList(osdFilter, osdCorrectFilter, osdErrorFilter,osdUnknownFilter);
List<String> rList = lists.stream().map(filter -> {
// 鏋勫缓鑱氬悎绠￠亾
List<Document> pipeline = Arrays.asList(
@@ -1020,11 +1135,11 @@
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))
+ .eq(params.getDataType().equals(2), CheckIndexVideo::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexVideo::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1130,7 +1245,7 @@
//鏌ヨ溅杈嗚澶�
query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Car + ".*"));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if(params.getOption()!=null) {
+ if (params.getOption() != null) {
query.addCriteria(Criteria.where("online").is(params.getOption()));
}
// 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
@@ -1143,11 +1258,11 @@
params.setDeptTag(-1);
params.setDeviceType(2);
resultList.forEach(item -> {
- if(item.getPingOnline() ==null){
+ if (item.getPingOnline() == null) {
item.setPingOnlineStr("鏈煡");
} else if (item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- } else if(!item.getPingOnline()){
+ } else if (!item.getPingOnline()) {
item.setPingOnlineStr("绂荤嚎");
}
if (1 == item.getOnline()) {
@@ -1161,10 +1276,10 @@
// 缁熻璁惧鏁伴噺
//鍗＄墖缁熻
- int totalCount =0;
- int onlineCount =0;
- int offlineCount =0;
- int unknownCount =0;
+ int totalCount = 0;
+ int onlineCount = 0;
+ int offlineCount = 0;
+ int unknownCount = 0;
//鏋勫缓鏉′欢
List<Criteria> criteriaList = new ArrayList<>();
// 娣诲姞鍥哄畾鏉′欢
@@ -1189,15 +1304,16 @@
// 鎵ц鑱氬悎鏌ヨ
AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
- unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
List<CheckIndexCar> videoList = new LambdaQueryChainWrapper<>(checkIndexCarService.getBaseMapper())
.select(CheckIndexCar::getSiteOnline)
.eq(params.getDataType().equals(1), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Province)
+ .eq(params.getDataType().equals(2), CheckIndexCar::getExamineTag, CheckConstants.Examine_Tag_Dept)
.between(CheckIndexCar::getCreateTime, DateUtils.getDayStart(params.getStartTime()), DateUtils.getDayEnd(params.getEndTime()))
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
@@ -1207,7 +1323,7 @@
onlineRate = sum.divide(count, 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+ map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -1689,7 +1805,7 @@
//鏌ヤ汉鑴歌澶�
query.addCriteria(Criteria.where("monitorType").regex(".*" + CheckConstants.Rule_Category_Face + ".*"));
//涓嬫媺妗嗗湪绾挎儏鍐垫煡璇㈡潯浠�
- if(params.getOption()!=null) {
+ if (params.getOption() != null) {
query.addCriteria(Criteria.where("online").is(params.getOption()));
}
// 閫氳繃pingOnline瀛楁鎺掑簭锛屼负false鐨勬帓鍦ㄥ墠闈�
@@ -1699,11 +1815,11 @@
MongoUtil.setPage(query, params, TIME_FIELD);
List<TMonitorResult> resultList = mongoTemplate.find(query, TMonitorResult.class);
resultList.forEach(item -> {
- if(item.getPingOnline() ==null){
+ if (item.getPingOnline() == null) {
item.setPingOnlineStr("鏈煡");
} else if (item.getPingOnline()) {
item.setPingOnlineStr("鍦ㄧ嚎");
- } else if(!item.getPingOnline()){
+ } else if (!item.getPingOnline()) {
item.setPingOnlineStr("绂荤嚎");
}
if (1 == item.getOnline()) {
@@ -1719,10 +1835,10 @@
// 缁熻璁惧鏁伴噺
//鍗＄墖缁熻
- int totalCount =0;
- int onlineCount =0;
- int offlineCount =0;
- int unknownCount =0;
+ int totalCount = 0;
+ int onlineCount = 0;
+ int offlineCount = 0;
+ int unknownCount = 0;
//鏋勫缓鏉′欢
List<Criteria> criteriaList = new ArrayList<>();
// 娣诲姞鍥哄畾鏉′欢
@@ -1747,15 +1863,16 @@
// 鎵ц鑱氬悎鏌ヨ
AggregationResults<Map> results = mongoTemplate.aggregate(aggregation, "t_monitor_online", Map.class); // 鏇挎崲涓轰綘鐨勯泦鍚堝悕绉�
for (Map<String, Object> result : results.getMappedResults()) {
- offlineCount =(Integer) result.getOrDefault("offlineCount",0L);
- unknownCount =(Integer) result.getOrDefault("unknownCount",0L);
- onlineCount = (Integer) result.getOrDefault("onlineCount",0L);
+ offlineCount = (Integer) result.getOrDefault("offlineCount", 0L);
+ unknownCount = (Integer) result.getOrDefault("unknownCount", 0L);
+ onlineCount = (Integer) result.getOrDefault("onlineCount", 0L);
totalCount = offlineCount + unknownCount + onlineCount;
}
List<CheckIndexFace> videoList = new LambdaQueryChainWrapper<>(checkIndexFaceService.getBaseMapper())
.select(CheckIndexFace::getSiteOnline)
.eq(params.getDataType().equals(1), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Province)
- .between(CheckIndexFace::getCreateTime, params.getStartTime(), params.getEndTime())
+ .eq(params.getDataType().equals(2), CheckIndexFace::getExamineTag, CheckConstants.Examine_Tag_Dept)
+ .between(CheckIndexFace::getCreateTime, params.getStartTime(), params.getEndTime())
.list();
BigDecimal onlineRate = BigDecimal.ZERO;
if (CollectionUtils.isNotEmpty(videoList)) {
@@ -1765,7 +1882,7 @@
}
HashMap<String, Object> map = new HashMap<>();
- map.put("count", Arrays.asList(totalCount + "",onlineCount +"",offlineCount+"" ,unknownCount+"", this.remove0(onlineRate)));
+ map.put("count", Arrays.asList(totalCount + "", onlineCount + "", offlineCount + "", unknownCount + "", this.remove0(onlineRate)));
map.put("list", resultList);
return Result.ok().data(map).total(total);
}
@@ -2207,5 +2324,9 @@
} else if (params.getDataType().equals(2)) {
dList.add(new Document("deptTag", new Document("$eq", Boolean.TRUE)));
}
+ Document mongoCreateTimeRange = new Document()
+ .append("$gte", params.getStartTime())
+ .append("$lt", params.getEndTime());
+ dList.add(new Document("mongoCreateTime", mongoCreateTimeRange));
}
}
--
Gitblit v1.8.0