From fb7012d6016229ad0159efebddf64be1fd3e642f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 19 八月 2024 09:32:50 +0800
Subject: [PATCH] 任务测试
---
ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 19 ++--
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java | 2
ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java | 3
ycl-server/src/main/resources/application-prod.yml | 2
ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java | 15 ++-
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 2
ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java | 13 ++-
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 7 +
ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java | 5 +
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 18 ++-
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java | 3
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 23 +++--
ycl-server/src/main/java/com/ycl/task/UYTask.java | 32 --------
ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 18 +++-
25 files changed, 117 insertions(+), 78 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
index 5a90295..777d77e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
@@ -108,7 +108,7 @@
/** 瑙嗛浼犺緭缃戝嵄闄╄祫浜у緱鍒嗘瘮閲� */
@Excel(name = "瑙嗛浼犺緭缃戝嵄闄╄祫浜у緱鍒嗘瘮閲�",width = 25)
- @TableField("video_transmission_dangerous_assetsScore")
+ @TableField("video_transmission_dangerous_assets_score")
private BigDecimal videoTransmissionDangerousAssetsScore;
/** 瑙嗛浼犺緭缃戣竟鐣屽畬鏁存�ф娴嬫墸鍒嗛」 */
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
index 09d8173..47892d1 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
@@ -14,6 +14,7 @@
import com.ycl.system.mapper.SysConfigMapper;
import constant.ApiConstants;
import constant.CheckSnapCountConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -37,6 +38,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarClockAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceInspectionResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -54,6 +56,7 @@
@Override
public void calculate(List<VehicleDeviceInspectionResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java
index 3b216a4..a5f0897 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java
@@ -11,6 +11,7 @@
import constant.ApiConstants;
import constant.CheckConstants;
import constant.RedisConstant;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarConsistentCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -51,6 +53,7 @@
@Override
public void calculate(List<TMonitorVO> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
index 8863fb4..29b2db9 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -14,6 +14,7 @@
import com.ycl.system.mapper.SysConfigMapper;
import constant.ApiConstants;
import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -31,6 +32,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarDataIntegrityCalculation extends IndexCalculationServe implements CalculationStrategy<DataIntegrityMonitoringResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -50,6 +52,7 @@
@Override
public void calculate(List<DataIntegrityMonitoringResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
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 5510dd4..651d501 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -7,6 +7,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexCarService;
import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -28,6 +29,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceSamplingResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -53,6 +55,7 @@
@Override
public void calculate(List<VehicleDeviceSamplingResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
@@ -149,8 +152,8 @@
checkIndexCar.setVehicleUrlAvailability(urlUsability);
//璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
Map<String, Object> usabilityParam = new HashMap<>();
- urlParam.put("totalSites", stats.totalSites);
- urlParam.put("picUsabilitySites", stats.picUsabilitySites);
+ usabilityParam.put("totalSites", stats.totalSites);
+ usabilityParam.put("picUsabilitySites", stats.picUsabilitySites);
BigDecimal picUsability = picUsability(usabilityParam);
checkIndexCar.setVehiclePictureAvailability(picUsability);
return checkIndexCar;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
index 7acdf17..847de71 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
@@ -15,6 +15,7 @@
import constant.ApiConstants;
import constant.CheckConstants;
import constant.CheckSnapCountConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -34,6 +35,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarInFoAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<CrossDetailResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -51,6 +53,7 @@
@Override
public void calculate(List<CrossDetailResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index 0e98ab3..926be4b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -14,6 +14,7 @@
import constant.ApiConstants;
import constant.CheckConstants;
import constant.CheckSnapCountConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -34,6 +35,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarSnapshopDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -54,6 +56,7 @@
@Override
public void calculate(List<SnapshotDataMonitorResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
index 7c70908..8fdd2f9 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
@@ -14,6 +14,7 @@
import constant.ApiConstants;
import constant.CheckConstants;
import constant.CheckSnapCountConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -34,6 +35,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarSnapshotDelayCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDelayMonitorResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -56,6 +58,7 @@
@Override
public void calculate(List<SnapshotDelayMonitorResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
index 5999ad9..061acb5 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java
@@ -12,6 +12,7 @@
import com.ycl.platform.service.ICheckIndexFaceService;
import com.ycl.platform.service.ITMonitorService;
import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -33,6 +34,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class FaceClockAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<FaceDeviceInspectionResult> {
@Autowired
private CheckIndexFaceMapper CheckIndexFaceMapper;
@@ -50,6 +52,7 @@
@Override
public void calculate(List<FaceDeviceInspectionResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java
index a483526..318c549 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java
@@ -10,6 +10,7 @@
import constant.ApiConstants;
import constant.CheckConstants;
import constant.RedisConstant;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -31,6 +32,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class FaceConsistentCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@@ -50,6 +52,7 @@
@Override
public void calculate(List<TMonitorVO> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
index 0e2fa5b..4acd0cd 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
@@ -7,6 +7,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexFaceService;
import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -27,6 +28,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class FaceDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<FaceDeviceSamplingResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@@ -47,6 +49,7 @@
@Override
public void calculate(List<FaceDeviceSamplingResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
index 1514d8b..fa01638 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
@@ -14,6 +14,7 @@
import com.ycl.system.mapper.SysConfigMapper;
import constant.ApiConstants;
import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -31,6 +32,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class FaceInFoAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<MonitoringDetailResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@@ -48,6 +50,7 @@
@Override
public void calculate(List<MonitoringDetailResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
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 4e4818e..321c50d 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -14,6 +14,7 @@
import constant.ApiConstants;
import constant.CheckConstants;
import constant.CheckSnapCountConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -34,6 +35,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
//TODD:绯荤粺閰嶇疆閲岀殑鍖哄垎浜鸿劯鍜岃溅杈嗐�佺疮鍔犳鏁扮殑姒傚康銆佸尯鍘夸笉灏戜簬40璺紝涓嶈揪鏍囧競宸炵殑褰撴湀璇ラ」鎴愮哗涓嶈兘寰楀垎銆�
public class FaceSnapshotDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
@@ -55,6 +57,7 @@
@Override
public void calculate(List<SnapshotDataMonitorResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
index 04d781a..e109c2e 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
@@ -8,6 +8,7 @@
import com.ycl.platform.service.ICheckIndexFaceService;
import constant.ApiConstants;
import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -29,6 +30,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class FaceSnapshotDelayCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDelayMonitorResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@@ -51,6 +53,7 @@
@Override
public void calculate(List<SnapshotDelayMonitorResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index e1f2f1f..6b3f80d 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -46,6 +46,7 @@
BigDecimal qualifyMonitor = new BigDecimal((Integer) param.get("qualifyMonitor"));
return qualifyMonitor.divide(totalMonitors, 4, RoundingMode.HALF_UP);
}
+
//涓�鏈轰竴妗ｆ敞鍐岀巼鐜�
public BigDecimal monitorRegistration(Map<String, Object> param) {
//鏂�+姝ｅ湪鐢ㄧ殑妗ｆ鏁�
@@ -54,12 +55,14 @@
BigDecimal useSites = new BigDecimal((Integer) param.get("totalSites") - (Integer) param.get("newSites"));
return useSites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
+
//妗ｆ鑰冩牳姣�
public BigDecimal archivesRate(Map<String, Object> param) {
BigDecimal allFiles = new BigDecimal((Integer) param.get("allFiles"));
BigDecimal todayFiles = new BigDecimal((Integer) param.get("todayFiles"));
return todayFiles.divide(allFiles, 4, RoundingMode.HALF_UP);
}
+
//鐐逛綅鍦ㄧ嚎鐜�
public BigDecimal siteOnline(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
@@ -73,6 +76,7 @@
BigDecimal osdAccuracySites = new BigDecimal((Integer) param.get("osdAccuracySites"));
return osdAccuracySites.divide(totalSites, 4, RoundingMode.HALF_UP);
}
+
//瑙嗛鏃堕棿鍚堟牸鐜�
public BigDecimal osdTimeAccuracy(Map<String, Object> param) {
BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites"));
@@ -87,11 +91,12 @@
// 璁＄畻newSites鍗爐otalSites鐨勭櫨鍒嗘瘮鍊嶆暟
BigDecimal percentage = newSites.divide(totalSites, 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100));
BigDecimal result = BigDecimal.ONE;
- if(BigDecimal.ONE.compareTo(percentage) <= 0 ){
+ if (BigDecimal.ONE.compareTo(percentage) <= 0) {
result = result.subtract(percentage.multiply(new BigDecimal("0.1")));
}
return result.max(BigDecimal.ZERO);
}
+
//瑙嗗浘搴撳鎺ョǔ瀹氭��
public BigDecimal viewConnectStability(Map<String, Object> param) {
BigDecimal totalDataSum = new BigDecimal((Integer) param.get("totalDataSum"));
@@ -193,25 +198,27 @@
List<YwPoint> commandImages = pointMapper.selectByTag(null, null, Boolean.TRUE);
return CollectionUtils.isEmpty(commandImages) ? new ArrayList<>() : commandImages.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
}
+
//杩斿洖monitor
//TODO:鏃堕棿鍐欐浜�
public List<String> getMonitorFromMongo() {
- Date date = DateUtils.getDay(2024,7,13);
+ Date date = DateUtils.getDay(2024, 7, 13);
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
return CollectionUtils.isEmpty(oneMachineFileResults) ? new ArrayList<>() : oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList());
}
+
//妫�鏌ユ槸鍚﹀瓨鍦ㄥ綋鏃ユ暟鎹�
public <T extends CheckIndex> T getCheckIndex(String key, List<T> checkIndexList, Class<T> clazz) {
T checkIndex;
// 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
Optional<T> existingIndex = checkIndexList.stream()
- .filter(index -> key.equals(index.getDeptId().toString()) &&
- (key.startsWith(ApiConstants.Province) ? CheckConstants.Examine_Tag_Province.equals(index.getExamineTag())
- : CheckConstants.Examine_Tag_County.equals(index.getExamineTag())))
+ .filter(index -> key.startsWith(ApiConstants.Province) ?
+ CheckConstants.Examine_Tag_Province.equals(index.getExamineTag()) && key.split("_")[1].equals(index.getDeptId().toString())
+ : CheckConstants.Examine_Tag_County.equals(index.getExamineTag()) && key.equals(index.getDeptId().toString()))
.findFirst();
if (existingIndex.isPresent()) {
@@ -229,4 +236,5 @@
}
return checkIndex;
}
+
}
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 484ae15..062cb76 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
@@ -8,6 +8,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -28,6 +29,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class MonitorQualifyCalculation extends IndexCalculationServe implements CalculationStrategy<MonitorQualifyResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@@ -47,6 +49,7 @@
@Override
public void calculate(List<MonitorQualifyResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
index d654649..70b9707 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -11,6 +11,7 @@
import com.ycl.platform.service.ICheckIndexVideoService;
import constant.ApiConstants;
import constant.RedisConstant;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -29,6 +30,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class MonitorRegistrationCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@@ -52,6 +54,7 @@
@Override
public void calculate(List<TMonitorVO> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
@@ -91,11 +94,11 @@
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexVideo> checkIndexVideoList = checkIndexVideoMapper.selectToday(DateUtils.getDate());
List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
- areaStatsMap.forEach((deptId, stats) -> {
+ areaStatsMap.forEach((key, stats) -> {
if (stats.totalSites > 0) {
- CheckIndexVideo CheckIndexVideo = createOrUpdateCheckIndexVideo(deptId, stats, checkIndexVideoList);
- if (CheckIndexVideo != null) {
- checkIndexVideos.add(CheckIndexVideo);
+ CheckIndexVideo checkIndexVideo = createOrUpdateCheckIndexVideo(key, stats, checkIndexVideoList);
+ if (checkIndexVideo != null) {
+ checkIndexVideos.add(checkIndexVideo);
}
}
});
@@ -134,10 +137,10 @@
BigDecimal monitorRegistration = monitorRegistration(param);
checkIndexVideo.setMonitorRegistration(monitorRegistration);
//璋冪敤妗ｆ鑰冩牳姣旇绠�
- Map<String, Object> importantParam = new HashMap<>();
- param.put("allFiles", stats.allFiles);
- param.put("todayFiles", stats.todayFiles);
- BigDecimal archivesRate = archivesRate(importantParam);
+ Map<String, Object> archiveParam = new HashMap<>();
+ archiveParam.put("allFiles", stats.allFiles);
+ archiveParam.put("todayFiles", stats.todayFiles);
+ BigDecimal archivesRate = archivesRate(archiveParam);
checkIndexVideo.setArchivesRate(archivesRate);
return checkIndexVideo;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
index 6514277..6f0c037 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/PlatformOnlineCalculation.java
@@ -8,6 +8,7 @@
import com.ycl.system.mapper.SysDeptMapper;
import constant.ApiConstants;
import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -25,6 +26,7 @@
* 涓嶅尯鍒嗗尯鍩�
*/
@Component
+@Slf4j
public class PlatformOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<PlatformOnlineVO> {
@Autowired
private SysDeptMapper deptMapper;
@@ -60,8 +62,9 @@
videos.add(checkIndex);
}
});
-
checkIndexVideoService.saveOrUpdateBatch(videos);
+ }else {
+ log.info("鏁版嵁涓虹┖");
}
}
}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
index 5c4f9ea..0f25d77 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
@@ -13,6 +13,7 @@
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.ITMonitorService;
import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -34,6 +35,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class VideoOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<VideoOnlineResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@@ -55,6 +57,7 @@
@Override
public void calculate(List<VideoOnlineResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
@@ -140,15 +143,15 @@
checkIndexVideo.setSiteOnline(siteOnline);
//璋冪敤鐐逛綅鍦ㄧ嚎鐜囪绠楁柟娉� 璁＄畻閲嶇偣鐐逛綅鍦ㄧ嚎鐜�
Map<String, Object> importantParam = new HashMap<>();
- param.put("totalSites", stats.importantSites);
- param.put("onlineSites", stats.importantOnlineSites);
+ importantParam.put("totalSites", stats.importantSites);
+ importantParam.put("onlineSites", stats.importantOnlineSites);
BigDecimal importantSiteOnline = siteOnline(importantParam);
checkIndexVideo.setKeySiteOnline(importantSiteOnline);
//璋冪敤鐐逛綅鍦ㄧ嚎鐜囪绠楁柟娉� 璁＄畻鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
Map<String, Object> commandParam = new HashMap<>();
- param.put("totalSites", stats.commandSites);
- param.put("onlineSites", stats.commandOnlineSites);
- BigDecimal commandSiteOnline = siteOnline(importantParam);
+ commandParam.put("totalSites", stats.commandSites);
+ commandParam.put("onlineSites", stats.commandOnlineSites);
+ BigDecimal commandSiteOnline = siteOnline(commandParam);
checkIndexVideo.setKeyCommandImageOnline(commandSiteOnline);
return checkIndexVideo;
}
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 7369100..54ddecb 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
@@ -8,6 +8,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -30,6 +31,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class VideoOsdCalculation extends IndexCalculationServe implements CalculationStrategy<PyOsdResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@@ -52,6 +54,7 @@
@Override
public void calculate(List<PyOsdResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
@@ -159,21 +162,21 @@
checkIndexVideo.setAnnotationAccuracy(osdAccuracy);
//璋冪敤osd鏍囨敞璁＄畻鏂规硶 璁＄畻閲嶇偣osd鏍囨敞
Map<String, Object> importantParam = new HashMap<>();
- param.put("totalSites", stats.importantTotalSites);
- param.put("osdAccuracySites", stats.importantOsdAccuracySites);
+ importantParam.put("totalSites", stats.importantTotalSites);
+ importantParam.put("osdAccuracySites", stats.importantOsdAccuracySites);
BigDecimal imOsdAccuracy = osdAccuracy(importantParam);
checkIndexVideo.setKeyAnnotationAccuracy(imOsdAccuracy);
//璋冪敤osd鏃堕棿鍑嗙‘鐜�
Map<String, Object> timeParam = new HashMap<>();
- param.put("totalSites", stats.totalSites);
- param.put("timeAccuracySites", stats.timeAccuracySites);
+ timeParam.put("totalSites", stats.totalSites);
+ timeParam.put("timeAccuracySites", stats.timeAccuracySites);
BigDecimal osdTimeAccuracy = osdTimeAccuracy(timeParam);
checkIndexVideo.setTimingAccuracy(osdTimeAccuracy);
//璋冪敤osd鏃堕棿鍑嗙‘鐜�,璁＄畻閲嶇偣
Map<String, Object> importantTimeParam = new HashMap<>();
- param.put("totalSites", stats.importantTotalSites);
- param.put("timeAccuracySites", stats.importantTimeAccuracySites);
+ importantTimeParam.put("totalSites", stats.importantTotalSites);
+ importantTimeParam.put("timeAccuracySites", stats.importantTimeAccuracySites);
BigDecimal imOsdTimeAccuracy = osdTimeAccuracy(importantTimeParam);
checkIndexVideo.setKeyTimingAccuracy(imOsdTimeAccuracy);
return checkIndexVideo;
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 1b267fc..b169a11 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -5,12 +5,14 @@
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexVideoMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.ITMonitorService;
import constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -32,7 +34,8 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class VideoUsabilityCalculation extends IndexCalculationServe implements CalculationStrategy<RecordMetaDSumParam> {
+@Slf4j
+public class VideoUsabilityCalculation extends IndexCalculationServe implements CalculationStrategy<RecordMetaDSumResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@Autowired
@@ -49,13 +52,14 @@
}
@Override
- public void calculate(List<RecordMetaDSumParam> list) {
+ public void calculate(List<RecordMetaDSumResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(RecordMetaDSumParam::getDeviceId).collect(Collectors.toList()))
+ Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(RecordMetaDSumResult::getDeviceId).collect(Collectors.toList()))
.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
//鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
List<String> provinceIds = getProvince();
@@ -63,7 +67,7 @@
List<String> important = getImportant();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
- for (RecordMetaDSumParam result : list) {
+ for (RecordMetaDSumResult result : list) {
TMonitorVO monitor = monitorMap.get(result.getDeviceId());
if (monitor == null) continue;
@@ -95,7 +99,7 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumParam result, List<String> important) {
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result, List<String> important) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
@@ -127,8 +131,8 @@
checkIndexVideo.setVideoAvailable(videoUsability);
//璋冪敤褰曞儚鍙敤鐜囪绠楁柟娉� 璁＄畻閲嶇偣鐐逛綅褰曞儚鍙敤鐜�
Map<String, Object> importantParam = new HashMap<>();
- param.put("totalSites", stats.importantSites);
- param.put("usabilitySites", stats.importantUsabilitySites);
+ importantParam.put("totalSites", stats.importantSites);
+ importantParam.put("usabilitySites", stats.importantUsabilitySites);
BigDecimal importantVideoUsability = videoUsability(importantParam);
checkIndexVideo.setKeyVideoAvailable(importantVideoUsability);
return checkIndexVideo;
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index bc08a68..7941624 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -58,6 +58,7 @@
//鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�
@Transactional(rollbackFor = Exception.class)
public void synchronize() {
+ log.info("寮�濮嬪悓姝ongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
Date date = DateUtils.getDay(2024,7,13);
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -102,6 +103,7 @@
}
//鏂扮殑鏁版嵁鏀惧叆Redis涓瓑寰呰�冩牳鎸囨爣浠诲姟浣跨敤
redisTemplate.opsForValue().set(RedisConstant.New_Monitor_Set, JSONArray.toJSONString(newMonitorList));
+ log.info("缁撴潫鍚屾mongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
}
private YwPoint getPoint(MonitorQualifyResult result, Map<String, YwPoint> pointMap, List<String> importantSite) {
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index 587d9bc..1c0d8af 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -91,38 +91,6 @@
log.info("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾");
}
-// //涓�鏈轰竴妗�
-// public void monitorTask() {
-// // 涓�鏈轰竴妗ｆ敞鍐岀巼
-// // 妗ｆ鑰冩牳姣�
-// log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｆ暟鎹悓姝�");
-// OneMachineFileParam param = new OneMachineFileParam();
-// param.setOffset(ApiConstants.PageNo);
-// param.setLimit(ApiConstants.PageSize);
-// JSONObject jsonObject = uyClient.oneMachineFile(param);
-// if (jsonObject != null) {
-// JSONObject cameraList = jsonObject.getJSONObject("CameraList");
-// if (cameraList != null) {
-// List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class);
-// if (!CollectionUtils.isEmpty(data)) {
-// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
-// Query query = new Query(Criteria
-// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
-// DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class);
-// //瀛樻斁鍦╩ongo涓�
-// mongoTemplate.insertAll(data);
-// } else {
-// log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
-// }
-// } else {
-// log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", jsonObject);
-// }
-// } else {
-// log.error("涓�鏈轰竴妗ｆ暟鎹负绌�");
-// }
-// log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
-// }
-
//涓�鏈轰竴妗�
public void monitorQualifyTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
index 1d212aa..522d096 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -6,10 +6,7 @@
import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
-import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
-import com.ycl.platform.domain.result.UY.PyOsdResult;
-import com.ycl.platform.domain.result.UY.QueryVqdResult;
-import com.ycl.platform.domain.result.UY.VideoOnlineResult;
+import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.domain.vo.PlatformOnlineVO;
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexVideoMapper;
@@ -51,10 +48,12 @@
public void siteOnlineTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
+ //TODO:鏃堕棿鍐欐浜�
+ Date date = DateUtils.getDay(2024,7,13);
//璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰閲嶇偣鐐逛綅鍦ㄧ嚎鐜囧拰鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline);
@@ -63,12 +62,14 @@
public void videoUsabilityTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
+ //TODO:鏃堕棿鍐欐浜�
+ Date date = DateUtils.getDay(2024,7,13);
//璁＄畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
- List<RecordMetaDSumParam> results = mongoTemplate.find(query, RecordMetaDSumParam.class);
+ List<RecordMetaDSumResult> results = mongoTemplate.find(query, RecordMetaDSumResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
calculator.calculate(results);
}
@@ -76,13 +77,13 @@
public void oneMonitorFileTask() {
//璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�
List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
- CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate);
calculator.calculate(tMonitorVOS);
}
- //TODO:鏃堕棿鍐欐浜�
public void oneMonitorQualifyTask(){
//璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
// Date yesterday = DateUtils.addDays(new Date(), -1);
+ //TODO:鏃堕棿鍐欐浜�
Date date = DateUtils.getDay(2024,7,13);
Query query = new Query();
query.addCriteria(Criteria
@@ -100,9 +101,11 @@
public void osdTask() {
//璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼
Date yesterday = DateUtils.addDays(new Date(), -1);
+ //TODO:鏃堕棿鍐欐浜�
+ Date date = DateUtils.getDay(2024,7,13);
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
List<PyOsdResult> results = mongoTemplate.find(query, PyOsdResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime);
calculator.calculate(results);
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 5010d56..4b089b1 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -36,7 +36,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://51.92.65.72:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8
+ url: jdbc:mysql://51.92.65.72:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true
username: root
password: zgyw@202488
type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.8.0