From d262634363777dc30f4470120e44552bd6b3d5ee Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 31 七月 2024 15:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java | 5 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java | 2
ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java | 8 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 5 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java | 5 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java | 2
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java | 13 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java | 5 +
ycl-server/src/main/java/com/ycl/task/HKTask.java | 5 -
ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java | 6 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 5 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java | 5 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java | 2
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 5
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 28 +++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java | 2
ycl-server/src/main/java/com/ycl/task/UYTask.java | 64 ++++++++++-----
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java | 2
31 files changed, 139 insertions(+), 56 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
index 9680e21..54a2676 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
@@ -2,6 +2,7 @@
import lombok.Data;
import org.bson.types.ObjectId;
+import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.Id;
import java.util.Date;
@@ -9,9 +10,10 @@
@Data
public class BaseResult {
@Id
- private ObjectId id;
+ private ObjectId mongoId;
/**
* 鏁版嵁鏃ユ湡
*/
- private Date createTime;
+ @CreatedDate
+ private Date mongoCreateTime;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java
index e376fad..37b6b22 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "attr_recognition_monitor")
+@Document(collection = "hk_attr_recognition_monitor")
public class AttrRecognitionMonitorResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java
index 448e475..3d9c2a5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "car_detect")
+@Document(collection = "hk_car_detect")
public class CarDetectResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java
index f87a3e9..e91e938 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "code_by_area")
+@Document(collection = "hk_code_by_area")
public class CodeByAreaResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java
index 42dc94b..f829d1f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "coordinate_by_area")
+@Document(collection = "hk_coordinate_by_area")
public class CoordinateByAreaResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java
index 81287fd..61dda11 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "criteria")
+@Document(collection = "hk_criteria")
public class CriteriaResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java
index e954bbf..72b6697 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "cross_detail")
+@Document(collection = "hk_cross_detail")
public class CrossDetailResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java
index f48fab5..685e7e4 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "data_integrity_monitoring")
+@Document(collection = "hk_data_integrity_monitoring")
public class DataIntegrityMonitoringResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java
index 5bded9b..60c1e10 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "face_detect")
+@Document(collection = "hk_face_detect")
public class FaceDetectResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
index 6bf7b78..c762e90 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "face_device_inspection")
+@Document(collection = "hk_face_device_inspection")
public class FaceDeviceInspectionResult extends BaseResult {
/**
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 be04912..b4019bd 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
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "face_device_sampling")
+@Document(collection = "hk_face_device_sampling")
public class FaceDeviceSamplingResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java
index 69e5211..53d0e89 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java
@@ -11,7 +11,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "monitor_resource")
+@Document(collection = "hk_monitor_resource")
public class MonitorResourceResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
index 11bf95c..4aa4930 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "monitoring_detail")
+@Document(collection = "hk_monitoring_detail")
public class MonitoringDetailResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java
index 1530159..a8e21d0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java
@@ -12,7 +12,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "organization_tree")
+@Document(collection = "hk_organization_tree")
public class OrganizationTreeResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java
index 198895e..4c33109 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "pic_access")
+@Document(collection = "hk_pic_access")
public class PicAccessResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java
index 20f8da0..7b56100 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "snapshot_data_monitor")
+@Document(collection = "hk_snapshot_data_monitor")
public class SnapshotDataMonitorResult extends BaseResult {
/**
* 鏁版嵁绫诲瀷
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java
index 3c826f5..2f394fd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "snapshop_delay_monitor")
+@Document(collection = "hk_snapshop_delay_monitor")
public class SnapshotDelayMonitorResult extends BaseResult {
private Integer dataType;
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
index 0f87d90..dca7d43 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "vehicle_device_inspection")
+@Document(collection = "hk_vehicle_device_inspection")
public class VehicleDeviceInspectionResult extends BaseResult {
/**
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 349f687..c7428d1 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
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "vehicle_device_sampling")
+@Document(collection = "hk_vehicle_device_sampling")
public class VehicleDeviceSamplingResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
index 454143c..f6d6087 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
@@ -11,7 +13,8 @@
* @since 2024-4-19 11:33:34
*/
@Data
-public class OneMachineFileResult {
+@Document(collection = "uy_one_machine_file")
+public class OneMachineFileResult extends BaseResult {
/**
* 璁惧缂栫爜锛�20浣嶏細涓績缂栫爜銆佽涓氱紪鐮併�佽澶囩被鍨嬨�佺綉缁滄爣璇嗐�佽澶囧簭鍙凤紝涓庤仈缃戝钩鍙�/鍏变韩骞冲彴鍥芥爣缂栫爜涓�鑷淬��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
index c5884ff..101416b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 鐐逛綅鍦ㄧ嚎鐜�
@@ -9,7 +11,8 @@
* @since 2024-4-19 11:37:30
*/
@Data
-public class OnlineResult{
+@Document(collection = "uy_online")
+public class OnlineResult extends BaseResult {
/**
* 琛屾斂鍖哄垝缂栫爜
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
index 8ac3736..7141e2a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.List;
@@ -11,7 +13,8 @@
* @since 2024-4-19 11:52:09
*/
@Data
-public class OsdMonitorResult {
+@Document(collection = "uy_osd_monitor")
+public class OsdMonitorResult extends BaseResult {
/**
* 鍖哄煙璺緞淇℃伅
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java
index d076629..79667e5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java
@@ -1,12 +1,15 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 鍥惧儚鐩戞祴璇婃柇缁撴灉
*/
@Data
-public class QueryVqdResult {
+@Document(collection = "uy_query_vqd")
+public class QueryVqdResult extends BaseResult {
/**
*
*/
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
index 86f5770..f356f79 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
@@ -10,7 +12,8 @@
* @author gonghl
*/
@Data
-public class RecordMetaDSumResult{
+@Document(collection = "uy_record_meta_d_sum")
+public class RecordMetaDSumResult extends BaseResult {
/**
* 琛屾斂鍖哄煙鍚嶇О
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java
index 0a16fc4..7fb3597 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java
@@ -1,12 +1,15 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 瑙嗛鍥惧儚璐ㄩ噺
*/
@Data
-public class VideoQualityResult {
+@Document(collection = "uy_video_quality")
+public class VideoQualityResult extends BaseResult {
/** 琛屾斂鍖哄垝缂栫爜 */
private String arealayernoCode;
/** 琛屾斂鍖哄垝鍚嶇О */
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
index bdcb0ec..4b2e20e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -8,11 +8,9 @@
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
-import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
@@ -44,6 +42,17 @@
}
/**
+ * 鏌ヨ鑰冩牳绉垎鎶樼嚎鍥�
+ */
+// @PreAuthorize("@ss.hasPermi('check:score:chart')")
+ @GetMapping("/chart")
+ public AjaxResult selectCheckScoreChart(CheckScore checkScore)
+ {
+ Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreChart(checkScore);
+ return success(deptMap);
+ }
+
+ /**
* 鍖哄幙璇︽儏鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('check:score:list')")
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
index 0d3f138..32112e0 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
@@ -35,6 +35,14 @@
*/
public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore);
+ /**
+ * 鏌ヨ鑰冩牳绉垎鎶樼嚎鍥炬暟鎹�
+ *
+ * @param checkScore 鑰冩牳绉垎鍙傛暟
+ * @return 鑰冩牳绉垎鎶樼嚎鍥�
+ */
+ Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore);
+
int publishCheckScore(CheckScoreDTO checkScoreDTO);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index 4767a29..84cdd90 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -149,6 +149,34 @@
return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
}
+ /**
+ * 鏌ヨ鑰冩牳绉垎鍗＄墖鍒楄〃
+ *
+ * @param checkScore 鑰冩牳绉垎
+ * @return 鑰冩牳绉垎
+ */
+ @Override
+ @DataScope(deptAlias = "d",userAlias = "u")
+ public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore)
+ {
+ //鍖哄幙鍙兘鐪嬪凡鍙戝竷
+ roleControl(checkScore);
+
+ //鏌ヨ鎴愮哗
+ String date = checkScore.getDate();
+ if(StringUtils.isEmpty(date)){
+ //濡傛灉涓虹┖鏌ユ湰鏈堢殑鏁版嵁
+ Calendar now = Calendar.getInstance();
+ //鍙栨槰澶�
+ now.add(Calendar.DATE, -1);
+ Date yesterday = now.getTime();
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
+ date = simpleDateFormat.format(yesterday);
+ checkScore.setDate(date);
+ }
+ List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore);
+ return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId));
+ }
/**
* 鍖哄幙璇︽儏
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index 69e7a29..c3226fa 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -312,11 +312,6 @@
log.error(message, data);
return null;
}
- for (T t : list) {
- if (t instanceof BaseResult) {
- ((BaseResult) t).setCreateTime(new Date());
- }
- }
return list;
} else {
log.error(message);
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 be50d01..a1e1be4 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -1,15 +1,26 @@
package com.ycl.task;
+import com.alibaba.fastjson2.JSONObject;
+import com.mongodb.client.result.DeleteResult;
import com.ycl.platform.domain.param.UY.OnlineParam;
+import com.ycl.platform.domain.param.UY.QueryVqdParam;
+import com.ycl.platform.domain.result.HK.PicAccessResult;
+import com.ycl.platform.domain.result.UY.QueryVqdResult;
import com.ycl.platform.service.IYwThresholdService;
import com.ycl.feign.UYClient;
+import com.ycl.utils.DateUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Slf4j
@@ -23,37 +34,45 @@
@Autowired
private IYwThresholdService ywThresholdService;
- private final static Integer pageNo = 1;
- private final static Integer pageSize = 5000;
- //鎴愬姛鐘舵�佺爜
- private final static String successCode = "0";
-
- //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
- public void VehicleDeviceInspectionTask() {
- log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
-
- log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- }
-
-
- public void FaceDeviceInspectionTask() {
- log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
-
- log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- }
+ @Value("${youYun.tenantId}")
+ private String tenantId;
//涓�鏈轰竴妗�
- public void task1() {
+ public void monitorTask() {
+ log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｆ暟鎹悓姝�");
//涓�鏈轰竴妗ｅ悎鏍肩巼
// 涓�鏈轰竴妗ｆ敞鍐岀巼
// 妗ｆ鑰冩牳姣�
+ log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
}
//鍥惧儚鐩戞祴璇婃柇缁撴灉
public void queryVqdResultTask() {
//鐐逛綅鍦ㄧ嚎鐜�
log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�");
-
+ QueryVqdParam param = new QueryVqdParam();
+ param.setTenantId(tenantId);
+ JSONObject jsonObject = uyClient.queryVqdResult(param);
+ if (jsonObject != null) {
+ JSONObject cameraList = jsonObject.getJSONObject("CameraList");
+ if (cameraList != null) {
+ List<QueryVqdResult> data = cameraList.getList("data", QueryVqdResult.class);
+ if (!CollectionUtils.isEmpty(data)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(data);
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", cameraList);
+ }
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject);
+ }
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖");
+ }
log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾");
}
@@ -63,5 +82,8 @@
//褰曞儚鍙敤鐜�
}
-
+ //瑙嗛鍥惧儚璐ㄩ噺
+ public void task4() {
+ //褰曞儚鍙敤鐜�
+ }
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 12fb02b..0efeca1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -119,9 +119,10 @@
SELECT
tcs.dept_id,
examine_category,
- AVG(score) AS score,
+ ROUND(AVG(score), 2) AS score,
#{startDate} AS startDate,
- #{endDate} AS endDate
+ #{endDate} AS endDate,
+ ANY_VALUE(tcs.create_time) AS createTime
FROM
t_check_score tcs
LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
--
Gitblit v1.8.0