From e9af9f5cfeddbe5c0b33a3060b8ea6364c51e744 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 15 十一月 2024 11:37:10 +0800
Subject: [PATCH] 白名单故障类型
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 713fc0b..32b9f2c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -14,10 +14,7 @@
import com.ycl.platform.domain.query.DataCenterQuery;
import com.ycl.platform.domain.query.HomeQuery;
import com.ycl.platform.domain.result.BaseResult;
-import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
-import com.ycl.platform.domain.result.HK.FaceDeviceSamplingResult;
-import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
-import com.ycl.platform.domain.result.HK.VehicleDeviceSamplingResult;
+import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OsdCheckResult;
@@ -137,7 +134,7 @@
for (TMonitorVO monitor : monitors) {
if (!CollectionUtils.isEmpty(voList)) {
for (WorkOrderVO workOrderVO : voList) {
- if (monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
+ if (monitor.getWorkOrderNo()!=null && monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())) {
monitor.setUnitContact(workOrderVO.getUnitContact());
monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
@@ -189,21 +186,30 @@
}
// 杞﹁締鐩戞帶璁惧
if (Objects.equals(tMonitor.getCameraFunType(), "2")) {
- //灞炴�т竴鑷寸巼銆佸ぇ鍥俱�乽rl
+ //灞炴�т竴鑷寸巼銆佸ぇ鍥�
List<VehicleDeviceSamplingResult> sampleResults = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
+ List<PicAccessResult> picAccessResults = mongoTemplate.find(query, PicAccessResult.class);
//鎶撴媿閲忋�佹椂閽熴�佷笂浼�
List<VehicleDeviceInspectionResult> inspectResults = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
for (TMonitorVO monitor : monitors) {
monitor.setMongoCreateTime(now);
//涓�鏈轰竴妗�
setOneFile(monitorQualifyResults, monitor);
- //灞炴�т竴鑷寸巼銆佸ぇ鍥俱�乽rl
+ //url
+ if (!CollectionUtils.isEmpty(sampleResults)) {
+ for (PicAccessResult picAccessResult : picAccessResults) {
+ if (monitor.getSerialNumber().equals(picAccessResult.getNo())) {
+ BigDecimal bigDecimal = PicAccessResult.calUrl(picAccessResult);
+ monitor.setUrlPercent(bigDecimal);
+ }
+ }
+ }
+ //灞炴�т竴鑷寸巼銆佸ぇ鍥�
if (!CollectionUtils.isEmpty(sampleResults)) {
for (VehicleDeviceSamplingResult sampleResult : sampleResults) {
if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
if (sampleResult.getBigUseful() != null) {
monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
- monitor.setUrlPercent(VehicleDeviceSamplingResult.BigUsefulness.calUrl(sampleResult.getBigUseful()));
}
if (sampleResult.getVehDiff() != null) {
monitor.setImportantConPercent(sampleResult.getVehDiff().getImportantConPercent());
@@ -237,13 +243,12 @@
monitor.setMongoCreateTime(now);
//涓�鏈轰竴妗�
setOneFile(monitorQualifyResults, monitor);
- //浜鸿劯鍚堟牸銆佸ぇ鍥俱�乽rl璁块棶寮傚父
+ //浜鸿劯鍚堟牸銆佸ぇ鍥�
if (!CollectionUtils.isEmpty(sampleResults)) {
for (FaceDeviceSamplingResult sampleResult : sampleResults) {
if (monitor.getSerialNumber().equals(sampleResult.getNo())) {
if (sampleResult.getBigUseful() != null) {
monitor.setBigUsefulPercent(sampleResult.getBigUseful().getBigUsefulPercent());
- monitor.setUrlPercent(FaceDeviceSamplingResult.BigUsefulness.calUrl(sampleResult.getBigUseful()));
}
if (sampleResult.getFaceEligibility() != null)
monitor.setFacePercent(sampleResult.getFaceEligibility().getFaceEligPercent());
@@ -456,9 +461,10 @@
List<TMonitorResult> onlines = onlineList.stream().filter(tMonitorResult -> tMonitorResult.getMongoCreateTime().minusDays(1).equals(parseTime)).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(onlines)) {
videoExp.setTotal(onlines.size());
- videoExp.setOnline(Integer.valueOf(onlines.stream()
- .filter(TMonitorResult::getPingOnline)
- .count() + ""));
+ long count = onlines.stream()
+ .filter(item -> ApiConstants.UY_OnlineSite_Online.equals(item.getOnline()))
+ .count();
+ videoExp.setOnline(Integer.valueOf(count+""));
videoExp.setOffline(videoExp.getTotal() - videoExp.getOnline());
}
//璁剧疆瀛樺偍鎯呭喌
@@ -809,7 +815,7 @@
new Document("$group", new Document("_id", "$mongoCreateTime")
.append("onlineCount", new Document("$sum",
new Document("$cond", Arrays.asList(
- new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
+ new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
1,
0
))
@@ -911,7 +917,7 @@
new Document("$group", new Document("_id", "$mongoCreateTime")
.append("onlineCount", new Document("$sum",
new Document("$cond", Arrays.asList(
- new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
+ new Document("$eq", Arrays.asList("$online",ApiConstants.UY_OnlineSite_Online)),
1,
0
))
@@ -1022,7 +1028,7 @@
new Document("$group", new Document("_id", "$mongoCreateTime")
.append("onlineCount", new Document("$sum",
new Document("$cond", Arrays.asList(
- new Document("$eq", Arrays.asList("$online", Boolean.TRUE)),
+ new Document("$eq", Arrays.asList("$online", ApiConstants.UY_OnlineSite_Online)),
1,
0
))
@@ -1099,7 +1105,13 @@
for (TMonitorResult monitorResult : onlineResult) {
int dayOfMonth = monitorResult.getMongoCreateTime().getDayOfMonth();
String online = "";
- online += monitorResult.getPingOnline() ? "鍦ㄧ嚎" : "绂荤嚎";
+ if(ApiConstants.UY_OnlineSite_Online.equals(monitorResult.getOnline())){
+ online +="鍦ㄧ嚎";
+ }else if(ApiConstants.UY_OnlineSite_Offline.equals(monitorResult.getOnline())){
+ online +="绂荤嚎";
+ }else {
+ online +="鏈煡";
+ }
//鍙嶅皠璧嬪�硷紝瀛楁缁熶竴瀹氫箟涓篸ay+1锛�2锛�3...
Field field = videoDailyExp.getClass().getDeclaredField("day" + dayOfMonth);
field.setAccessible(true);
--
Gitblit v1.8.0