From a776ca9959e0c4696db0ab96cb59efcfe4061201 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 14 九月 2024 17:33:48 +0800
Subject: [PATCH] 运行监控展示数据重构
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 23 ++
ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java | 23 --
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 12 -
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 2
ycl-server/src/main/resources/application-dev.yml | 3
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java | 15 +
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 4
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java | 97 ++++++++--
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 228 ++++++++++++++++++------
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 11 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java | 22 ++
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 2
ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java | 16 -
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 7
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java | 17 +
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 2
16 files changed, 353 insertions(+), 131 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
index 99afc2a..0c1fcfb 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
@@ -5,6 +5,9 @@
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
/**
* 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉锛氫汉鑴革紙浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佷汉鑴稿崱鍙ｈ澶囨姄鎷嶆暟鎹ぇ鍥惧彲鐢ㄦ�э級
*
@@ -90,6 +93,18 @@
* OSD鏍囨敞寮傚父鏁版嵁閲�
*/
private Integer osdExpCount;
+
+ public static BigDecimal calUrl(BigUsefulness bigUseful) {
+ BigDecimal url = BigDecimal.ZERO;
+ if (bigUseful.getSampleCount() != 0) {
+ //鍥剧墖璁块棶姝ｅ父閲� = 鎶芥閲�-寮傚父閲�
+ BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
+ //鍥剧墖鎶芥閲�
+ BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
+ url = picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP);
+ }
+ return url;
+ }
}
@Data
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java
index ddd81b1..b564d6d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java
@@ -5,6 +5,9 @@
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
/**
* 杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉锛氳溅杈嗭紙杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬э級
*
@@ -79,6 +82,18 @@
* OSD鏍囨敞寮傚父鏁版嵁閲�
*/
private Integer osdExpCount;
+
+ public static BigDecimal calUrl(BigUsefulness bigUseful) {
+ BigDecimal url = BigDecimal.ZERO;
+ if (bigUseful.getSampleCount() != 0) {
+ //鍥剧墖璁块棶姝ｅ父閲� = 鎶芥閲�-寮傚父閲�
+ BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
+ //鍥剧墖鎶芥閲�
+ BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
+ url = picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP);
+ }
+ return url;
+ }
}
@Data
@@ -128,4 +143,6 @@
*/
private Float importantConPercent;
}
+
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
index 87a0eb0..eee213c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
@@ -82,4 +82,26 @@
@TextIndexed
private String value;
}
+
+ //鍏ㄥ杩攖ure
+ public static boolean correct(MonitorQualifyResult result) {
+ return checkError(result.getName()) &&
+ checkError(result.getCivilCode()) &&
+ checkError(result.getIp()) &&
+ checkError(result.getSerialNumber()) &&
+ checkError(result.getMacdz()) &&
+ checkError(result.getLatitude()) &&
+ checkError(result.getLongitude()) &&
+ checkError(result.getSbzt()) &&
+ checkError(result.getSxjcjqy()) &&
+ checkError(result.getSxjgnlx()) &&
+ checkError(result.getJkdwlx()) &&
+ checkError(result.getIntegrated_device())
+ ;
+ }
+
+ //妫�鏌ユ寚鏍囷紝姝ｅ父杩斿洖true
+ public static boolean checkError(MonitorQualifyResult.QualifyResult result) {
+ return result.getError() != null && !result.getError();
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index f2caa67..db21934 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
+import constant.ApiConstants;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
@@ -107,5 +108,15 @@
private Integer osdLbCorrect;
+ public static Boolean checkOsd(OsdCheckResult result) {
+ return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect()) &&
+ ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect()) &&
+ ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect()) &&
+ ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect()) &&
+ ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect());
+ }
+ public static Boolean checkTime(OsdCheckResult result) {
+ return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
index 3a03f64..9b5ea97 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java
@@ -5,6 +5,7 @@
import com.ycl.system.entity.BaseEntity;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -226,46 +227,105 @@
private String area;
private String error;
private String unitName;
- private LocalDate mongoCreateTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date mongoCreateTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
+ //寮傚父鎭㈠鐩戞帶瀛楁
/** 寮傚父鎭㈠鐩戞帶鏃堕棿澶╂暟 */
private String time;
/**
- * 褰撴棩鎺ユ敹鍒扮殑褰撴棩鎶撴媿閲�
+ * 宸ュ崟鍙�
*/
- private Integer dataCount;
+ private String workOrderNo;
+ /**
+ * 鑱旂郴浜�
+ */
+ private String unitContact;
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ private String unitContactPhone;
+ /**
+ * 杩愮淮浜哄憳鍚嶇О
+ */
+ private String ywPeopleName;
+ /**
+ * 鏁呴殰绫诲瀷
+ */
+ private String errorType;
+ //瑙嗛杞﹁締浜鸿劯鐩戞帶瀛楁
+ /**
+ * 涓�鏈轰竴妗ｅ悎鏍肩姸鎬�
+ */
+ private Boolean monitorQualify;
+ /**
+ * 鏄惁涓烘湭娉ㄥ唽璁惧
+ */
+ private Boolean newMonitor;
+ //瑙嗛mongo淇℃伅
+ /**
+ * 褰曞儚瀹屾暣鐘舵�� 1锛氬畬鏁达紝0锛氶棿姝囷紝-1锛氬紓甯�
+ */
+ private Integer videoComplete;
+ /**
+ * 褰曞儚缂哄け鏃堕暱
+ */
+ private Double videoLoseTime;
+ /**
+ * OSD
+ */
+ private Boolean OSD;
+ /**
+ * OSD鏃堕棿
+ */
+ private Boolean OSDTime;
+ //杞﹁締銆佷汉鑴竚ongo淇℃伅
+ /**
+ * 鎶撴媿鏁版嵁閲忕洃娴� 1:姝ｅ父 2:鏃犳暟鎹� 4:鏁版嵁閲忓皯
+ */
+ private Integer snapResult;
+ /**
+ * 褰撴棩鎶撴媿閲�
+ */
+ private Integer snapCount;
/**
* 鏃堕挓鍑嗙‘鐜�
*/
private Float clockPercent;
/**
+ * 涓婁紶鍙婃椂鐜�
+ */
+ private Float uploadPercent;
+ /**
* 澶у浘鍙敤鐜�
*/
private Float bigUsefulPercent;
/**
- * 涓昏灞炴�т竴鑷寸巼
+ * url鍙敤鐜�
*/
- private Float majorConPercent;
+ private BigDecimal urlPercent;
+ //杞﹁締
/**
- * 閲嶈灞炴�т竴鑷寸巼
+ * 涓昏灞炴�т竴鑷寸巼
*/
private Float importantConPercent;
/**
+ * 閲嶈灞炴�т竴鑷寸巼
+ */
+ private Float majorConPercent;
+ //浜鸿劯
+ /**
* 浜鸿劯鍚堟牸鐜�
*/
- private Float faceEligPercent;
+ private Float facePercent;
/**
- * 鍏抽敭甯ф椂寤�
+ * 寤烘ā澶辫触
*/
- private Integer ifmDelay;
- /**
- * 淇′护鏃跺欢
- */
- private Integer sipDelay;
- /**
- * 瑙嗛娴佹椂寤�
- */
- private Integer videoDelay;
-
+ private Float failPercent;
/**
* 鍔ㄦ�佸垪
*/
@@ -275,5 +335,4 @@
* 璁惧鍘傚晢锛� 0娴峰悍 1澶у崕 2瀹囪
*/
private Integer deviceType;
-
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index 38acde9..dcc4579 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -34,6 +34,8 @@
/** 杩愮淮鍗曚綅 */
private Integer unitId;
private String unitName;
+ private String unitContact;
+ private String unitContactPhone;
/** 宸ュ崟鏉ユ簮/璁惧鍚嶇О */
private String source;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index b30ce02..c9bdea2 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -90,15 +90,9 @@
if (bigUseful.getBigUsefulPercent() >= 0.9) {
stats.picUsabilitySites++;
}
- if (bigUseful.getSampleCount() != 0) {
- //鍥剧墖璁块棶姝ｅ父閲� = 鎶芥閲�-寮傚父閲�
- BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
- //鍥剧墖鎶芥閲�
- BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
- //鍥剧墖璁块棶鐜�>=90% 瑙嗕负鍚堟牸
- if (picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP).compareTo(new BigDecimal("0.9")) >= 0) {
- stats.urlUsabilitySites++;
- }
+ //鍥剧墖璁块棶鐜�>=90% 瑙嗕负鍚堟牸
+ if (VehicleDeviceSamplingResult.BigUsefulness.calUrl(bigUseful).compareTo(new BigDecimal("0.9")) >= 0) {
+ stats.urlUsabilitySites++;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index c115e68..ed3b42b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -31,7 +31,7 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻浜鸿劯鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
+ * 璁＄畻瑙嗗浘搴撳鎺ョǔ瀹氭��
* 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
index b832fb5..dc40d17 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
@@ -66,30 +66,9 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalMonitors++;
- if (result != null && correct(result)){
+ if (result != null && MonitorQualifyResult.correct(result)){
stats.qualifyMonitor++;
}
- }
- //鍏ㄥ杩攖ure
- private boolean correct(MonitorQualifyResult result) {
- return checkError(result.getName()) &&
- checkError(result.getCivilCode()) &&
- checkError(result.getIp()) &&
- checkError(result.getSerialNumber()) &&
- checkError(result.getMacdz()) &&
- checkError(result.getLatitude()) &&
- checkError(result.getLongitude()) &&
- checkError(result.getSbzt()) &&
- checkError(result.getSxjcjqy()) &&
- checkError(result.getSxjgnlx()) &&
- checkError(result.getJkdwlx()) &&
- checkError(result.getIntegrated_device())
- ;
- }
-
- //妫�鏌ユ寚鏍囷紝姝ｅ父杩斿洖true
- private boolean checkError(MonitorQualifyResult.QualifyResult result) {
- return result.getError() != null && !result.getError();
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
index c4c6c0e..8f772ca 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
@@ -70,25 +70,13 @@
//閲嶇偣鐐逛綅
if (result.getImportantTag()) {
stats.importantTotalSites++;
- if (checkOsd(result)) {
+ if (OsdCheckResult.checkOsd(result)) {
stats.importantOsdAccuracySites++;
}
- if (checkTime(result)) {
+ if (OsdCheckResult.checkTime(result)) {
stats.importantTimeAccuracySites++;
}
}
- }
-
- private Boolean checkOsd(OsdCheckResult result) {
- return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect());
- }
-
- private Boolean checkTime(OsdCheckResult result) {
- return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
index 8a8c35c..8a0af7f 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -34,7 +34,7 @@
@Autowired
private ICheckIndexVideoService checkIndexVideoService;
- //鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
+ //鍖哄煙褰曞儚鍙敤鐜囩殑鍐呴儴绫�
protected static class AreaStats {
int totalSites = 0;
int usabilitySites = 0;
@@ -91,7 +91,7 @@
}
/**
- * 瑙嗛鐐逛綅鍦ㄧ嚎鐜�
+ * 瑙嗛褰曞儚鍙敤鐜�
*/
private CheckIndexVideo createOrUpdateCheckIndexVideo(String key, AreaStats stats, List<CheckIndexVideo> checkIndexVideoList) {
CheckIndexVideo checkIndexVideo = getCheckIndex(key, checkIndexVideoList, CheckIndexVideo.class);
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
index c37308f..119e63e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -101,4 +101,11 @@
* @return
*/
WorkOrderDetailVO detailByNo(@Param("workOrderNo") String workOrderNo);
+
+ /**
+ * 琛ュ厖寮傚父鎭㈠鐩戞帶淇℃伅
+ * @param orders
+ * @return
+ */
+ List<WorkOrderVO> getRecoveryInfo(List<String> orders);
}
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 03aae29..d803fa2 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
@@ -11,15 +11,20 @@
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.UY.VideoOnlineResult;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
+import com.ycl.platform.domain.result.UY.OsdCheckResult;
+import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.vo.screen.MonitorRateVO;
import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.WorkOrderMapper;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.Result;
import com.ycl.system.page.PageUtil;
import com.ycl.system.service.ISysConfigService;
+import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +32,11 @@
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.time.LocalDate;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 璁惧璧勪骇Service涓氬姟灞傚鐞�
@@ -38,15 +45,15 @@
* @date 2024-03-04
*/
@Service
-public class TMonitorServiceImpl extends ServiceImpl<TMonitorMapper, TMonitor> implements ITMonitorService
-{
+public class TMonitorServiceImpl extends ServiceImpl<TMonitorMapper, TMonitor> implements ITMonitorService {
@Autowired
private TMonitorMapper tMonitorMapper;
@Autowired
private ISysConfigService configService;
@Autowired
private MongoTemplate mongoTemplate;
-
+ @Autowired
+ private WorkOrderMapper workOrderMapper;
/**
* 鏌ヨ璁惧璧勪骇
*
@@ -54,19 +61,19 @@
* @return 璁惧璧勪骇
*/
@Override
- public TMonitor selectTMonitorById(Long id)
- {
+ public TMonitor selectTMonitorById(Long id) {
return tMonitorMapper.selectTMonitorById(id);
}
/**
* 鏌ヨ璁惧璧勪骇鍒楄〃
+ * 寮傚父鎭㈠鐩戞帶銆佽溅杈嗐�佷汉鑴搞�佽棰戦�氱敤鎺ュ彛
*
* @param tMonitor 璁惧璧勪骇
* @return 璁惧璧勪骇
*/
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor) {
// 寮傚父鎭㈠鐩戞帶
if (Objects.equals(tMonitor.getRecovery(), 1L)) {
@@ -77,66 +84,167 @@
tMonitor.setTime(time);
}
List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
+ // 寮傚父鎭㈠鐩戞帶
+ if(Objects.equals(tMonitor.getRecovery(), 1L)){
+ //宸ュ崟鍙�
+ List<String> orders = monitors.stream().map(TMonitorVO::getWorkOrderNo).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(orders)){
+ return monitors;
+ }
+ List<WorkOrderVO> voList = workOrderMapper.getRecoveryInfo(orders);
+ for (TMonitorVO monitor : monitors) {
+ if(!CollectionUtils.isEmpty(voList)){
+ for (WorkOrderVO workOrderVO : voList) {
+ if(monitor.getWorkOrderNo().equals(workOrderVO.getWorkOrderNo())){
+ monitor.setUnitContact(workOrderVO.getUnitContact());
+ monitor.setUnitContactPhone(workOrderVO.getUnitContactPhone());
+ monitor.setYwPeopleName(workOrderVO.getYwPeopleName());
+ monitor.setErrorType(workOrderVO.getErrorType());
+ }
+ }
+ }
+ }
+ return monitors;
+ }
+ //璁惧缂栧彿
+ List<String> numbers = monitors.stream().map(TMonitorVO::getSerialNumber).collect(Collectors.toList());
+ Query query = new Query();
+ //TODO:鏈湴娴嬭瘯
+ // Date now = new Date()
+ Date now = DateUtils.getDay(2024, 7, 13);
+ query.addCriteria(Criteria.where("no").in(numbers)
+ .and("mongoCreateTime").gte(DateUtils.getDayStart(now)).lt(DateUtils.getDayEnd(now))
+ );
+ //涓�鏈轰竴妗ｄ俊鎭�
+ List<MonitorQualifyResult> monitorQualifyResults = mongoTemplate.find(query, MonitorQualifyResult.class);
// 瑙嗛鐩戞帶璁惧
if (Objects.equals(tMonitor.getCameraFunType(), "1")) {
- monitors.forEach(monitor -> {
- Query query = new Query();
- query.addCriteria(Criteria.where("deviceId").is(monitor.getSerialNumber())
- .and("mongoCreateTime").is(LocalDate.now())
- );
- VideoOnlineResult one = mongoTemplate.findOne(query, VideoOnlineResult.class);
- if (one != null) {
- monitor.setIfmDelay(one.getIfmDelay());
- monitor.setSipDelay(one.getSipDelay());
- monitor.setVideoDelay(one.getVideoDelay());
- monitor.setMongoCreateTime(one.getMongoCreateTime());
+ //OSD淇℃伅
+ List<OsdCheckResult> osdCheckResults = mongoTemplate.find(query, OsdCheckResult.class);
+ //褰曞儚鍙敤淇℃伅
+ List<RecordMetaDSumResult> videoResults = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ for (TMonitorVO monitor : monitors) {
+ monitor.setMongoCreateTime(now);
+ //涓�鏈轰竴妗�
+ setOneFile(monitorQualifyResults, monitor);
+ //褰曞儚
+ if (!CollectionUtils.isEmpty(videoResults)) {
+ for (RecordMetaDSumResult videoResult : videoResults) {
+ if (monitor.getSerialNumber().equals(videoResult.getNo())) {
+ monitor.setVideoComplete(videoResult.getRecordStatus());
+ monitor.setVideoLoseTime(videoResult.getMissDuration());
+ }
+ }
}
- });
+ //OSD
+ if (!CollectionUtils.isEmpty(osdCheckResults)) {
+ for (OsdCheckResult osdCheckResult : osdCheckResults) {
+ if (monitor.getSerialNumber().equals(osdCheckResult.getNo())) {
+ monitor.setOSD(OsdCheckResult.checkOsd(osdCheckResult));
+ monitor.setOSDTime(OsdCheckResult.checkTime(osdCheckResult));
+ }
+ }
+ }
+ }
}
// 杞﹁締鐩戞帶璁惧
if (Objects.equals(tMonitor.getCameraFunType(), "2")) {
- monitors.forEach(monitor -> {
- Query query = new Query();
- query.addCriteria(Criteria.where("externalIndexCode").is(monitor.getSerialNumber())
- .and("mongoCreateTime").is(LocalDate.now())
- );
- VehicleDeviceInspectionResult one = mongoTemplate.findOne(query, VehicleDeviceInspectionResult.class);
- VehicleDeviceSamplingResult two = mongoTemplate.findOne(query, VehicleDeviceSamplingResult.class);
- if (one != null) {
- monitor.setDataCount(one.getDataCount());
- monitor.setClockPercent(Objects.nonNull(one.getSnapClock()) ? one.getSnapClock().getClockPercent() : null);
- monitor.setMongoCreateTime(one.getMongoCreateTime());
+ //灞炴�т竴鑷寸巼銆佸ぇ鍥俱�乽rl
+ List<VehicleDeviceSamplingResult> sampleResults = mongoTemplate.find(query, VehicleDeviceSamplingResult.class);
+ //鎶撴媿閲忋�佹椂閽熴�佷笂浼�
+ List<VehicleDeviceInspectionResult> inspectResults = mongoTemplate.find(query, VehicleDeviceInspectionResult.class);
+ for (TMonitorVO monitor : monitors) {
+ monitor.setMongoCreateTime(now);
+ //涓�鏈轰竴妗�
+ setOneFile(monitorQualifyResults, monitor);
+ //灞炴�т竴鑷寸巼銆佸ぇ鍥俱�乽rl
+ 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());
+ monitor.setMajorConPercent(sampleResult.getVehDiff().getMajorConPercent());
+ }
+ }
+ }
}
- if (two != null) {
- monitor.setBigUsefulPercent(Objects.nonNull(two.getBigUseful()) ? two.getBigUseful().getBigUsefulPercent() : null);
- monitor.setMajorConPercent(Objects.nonNull(two.getVehDiff()) ? two.getVehDiff().getMajorConPercent() : null);
- monitor.setImportantConPercent(Objects.nonNull(two.getVehDiff()) ? two.getVehDiff().getImportantConPercent() : null);
- monitor.setMongoCreateTime(two.getMongoCreateTime());
+ //鎶撴媿閲忋�佹椂閽熴�佷笂浼�
+ if (!CollectionUtils.isEmpty(inspectResults)) {
+ for (VehicleDeviceInspectionResult inspectResult : inspectResults) {
+ if (monitor.getSerialNumber().equals(inspectResult.getNo())) {
+ monitor.setSnapResult(inspectResult.getSnapResult());
+ monitor.setSnapCount(inspectResult.getDataCount());
+ if (inspectResult.getSnapClock() != null)
+ monitor.setClockPercent(inspectResult.getSnapClock().getClockPercent());
+ if (inspectResult.getSnapTimely() != null)
+ monitor.setUploadPercent(inspectResult.getSnapTimely().getTimelyPercent());
+ }
+ }
}
- });
+ }
}
// 浜鸿劯鐩戞帶璁惧
if (Objects.equals(tMonitor.getCameraFunType(), "3")) {
- monitors.forEach(monitor -> {
- Query query = new Query();
- query.addCriteria(Criteria.where("externalIndexCode").is(monitor.getSerialNumber())
- .and("mongoCreateTime").is(LocalDate.now())
- );
- FaceDeviceInspectionResult one = mongoTemplate.findOne(query, FaceDeviceInspectionResult.class);
- FaceDeviceSamplingResult two = mongoTemplate.findOne(query, FaceDeviceSamplingResult.class);
- if (one != null) {
- monitor.setDataCount(one.getDataCount());
- monitor.setClockPercent(Objects.nonNull(one.getSnapClock()) ? one.getSnapClock().getClockPercent() : null);
- monitor.setMongoCreateTime(one.getMongoCreateTime());
+ //浜鸿劯鍚堟牸銆佸ぇ鍥俱�乽rl璁块棶寮傚父
+ List<FaceDeviceSamplingResult> sampleResults = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+ //鎶撴媿閲忋�佹椂閽熴�佷笂浼�
+ List<FaceDeviceInspectionResult> inspectResults = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
+ for (TMonitorVO monitor : monitors) {
+ 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());
+ }
+ }
}
- if (two != null) {
- monitor.setBigUsefulPercent(Objects.nonNull(two.getBigUseful())? two.getBigUseful().getBigUsefulPercent() : null);
- monitor.setFaceEligPercent(Objects.nonNull(two.getFaceEligibility()) ? two.getFaceEligibility().getFaceEligPercent() : null);
- monitor.setMongoCreateTime(two.getMongoCreateTime());
+ //鎶撴媿閲忋�佹椂閽熴�佷笂浼犮�佸缓妯″け璐ョ巼
+ if (!CollectionUtils.isEmpty(inspectResults)) {
+ for (FaceDeviceInspectionResult inspectResult : inspectResults) {
+ if (monitor.getSerialNumber().equals(inspectResult.getNo())) {
+ monitor.setSnapResult(inspectResult.getSnapResult());
+ monitor.setSnapCount(inspectResult.getDataCount());
+ if (inspectResult.getSnapClock() != null)
+ monitor.setClockPercent(inspectResult.getSnapClock().getClockPercent());
+ if (inspectResult.getSnapTimely() != null)
+ monitor.setUploadPercent(inspectResult.getSnapTimely().getTimelyPercent());
+ if (inspectResult.getSnapValidity() != null)
+ monitor.setFailPercent(inspectResult.getSnapValidity().getFailPercent());
+ }
+ }
}
- });
+ }
}
return monitors;
+ }
+
+ /**
+ * 琛ュ厖涓�鏈轰竴妗ｄ俊鎭�
+ *
+ * @param monitorQualifyResults
+ * @param monitor
+ */
+ private void setOneFile(List<MonitorQualifyResult> monitorQualifyResults, TMonitorVO monitor) {
+ if (!CollectionUtils.isEmpty(monitorQualifyResults)) {
+ for (MonitorQualifyResult oneFile : monitorQualifyResults) {
+ if (monitor.getSerialNumber().equals(oneFile.getNo())) {
+ monitor.setMonitorQualify(MonitorQualifyResult.correct(oneFile));
+ monitor.setNewMonitor(oneFile.getNewDevice());
+ }
+ }
+ }
}
/**
@@ -146,8 +254,7 @@
* @return 缁撴灉
*/
@Override
- public int insertTMonitor(TMonitor tMonitor)
- {
+ public int insertTMonitor(TMonitor tMonitor) {
return tMonitorMapper.insertTMonitor(tMonitor);
}
@@ -158,8 +265,7 @@
* @return 缁撴灉
*/
@Override
- public int updateTMonitor(TMonitor tMonitor)
- {
+ public int updateTMonitor(TMonitor tMonitor) {
return tMonitorMapper.updateTMonitor(tMonitor);
}
@@ -170,8 +276,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteTMonitorByIds(Long[] ids)
- {
+ public int deleteTMonitorByIds(Long[] ids) {
return tMonitorMapper.deleteTMonitorByIds(ids);
}
@@ -182,19 +287,18 @@
* @return 缁撴灉
*/
@Override
- public int deleteTMonitorById(Long id)
- {
+ public int deleteTMonitorById(Long id) {
return tMonitorMapper.deleteTMonitorById(id);
}
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public Map<String, String> getVideoCount(TMonitorVO tMonitor) {
return tMonitorMapper.getVideoCount(tMonitor);
}
@Override
- @DataScope(deptAlias = "d",userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u")
public Map<String, String> recoveryException(TMonitorVO monitor) {
// String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
// monitor.setTime(time);
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 137d862..394ae16 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -126,7 +126,8 @@
spring:
data:
mongodb:
- uri: mongodb://root1:yunwei%402024@192.168.3.88:27017/zgyw?authSource=admin
+# uri: mongodb://root1:yunwei%402024@192.168.3.88:27017/zgyw?authSource=admin
+ uri: mongodb://localhost:27017/zgyw
# 鎷夊彇鏁版嵁璇锋眰閰嶇疆
request:
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 1d17737..99950eb 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -99,7 +99,7 @@
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
camera_capture_area, p.online as onState, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag,
- IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name, p.recovery_time,p.reason from t_monitor m
+ IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name,p.recovery_time,p.reason,p.start_time,p.end_time,w.work_order_no from t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number and p.deleted = 0
left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
left join (
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index b65027e..91f4943 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -316,4 +316,27 @@
INNER JOIN t_monitor m ON m.serial_number = wo.serial_number
LEFT JOIN t_yw_unit yw ON yw.id = wo.unit_id AND yw.deleted = 0
</select>
+ <select id="getRecoveryInfo" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ SELECT
+ wo.work_order_no,
+ u.unit_name,
+ u.unit_contact,
+ u.unit_contact_phone,
+ p.yw_person_name,
+ GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
+ FROM
+ t_work_order wo
+ INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+ INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
+ INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
+ WHERE
+ wo.deleted = 0
+ GROUP BY
+ wo.work_order_no,
+ u.unit_name,
+ u.unit_contact,
+ u.unit_contact_phone,
+ p.yw_person_name
+ </select>
</mapper>
--
Gitblit v1.8.0