From 83dfb010715df4491d50c6676578661434517de2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 30 七月 2024 09:48:39 +0800
Subject: [PATCH] BaseResult
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java | 5 +
ycl-server/src/main/java/com/ycl/task/HKTask.java | 99 +++++++++++++++++++++++---------
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/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/OsdMonitorResult.java | 1
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/CrossDetailResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java | 2
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/CameraResult.java | 3
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 4 +
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java | 3
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java | 2
ycl-server/src/main/java/com/ycl/platform/controller/VehicleDataMonitorController.java | 10 +-
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/CriteriaResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.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
22 files changed, 103 insertions(+), 52 deletions(-)
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 7357db3..bebfdf8 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class AttrRecognitionMonitorResult {
+public class AttrRecognitionMonitorResult extends BaseResult{
/**
* 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮�
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 8b0994a..fac1fcd 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class CarDetectResult {
+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 6618159..b3f949e 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class CodeByAreaResult {
+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 cf9078a..e678d8e 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class CoordinateByAreaResult {
+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 c8b9614..bdcc9b7 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class CriteriaResult {
+public class CriteriaResult extends BaseResult{
/**
* 浜鸿劯璇勫垎浣庢爣鍑嗭紝渚嬪锛�0.4
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 f8867c8..c5800a4 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class CrossDetailResult {
+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 fbfc517..2a59e96 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class DataIntegrityMonitoringResult {
+public class DataIntegrityMonitoringResult extends BaseResult{
/**
* 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮�
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 373c796..78c02e3 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class FaceDetectResult {
+public class FaceDetectResult 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 bf3f498..cbd8ad7 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class FaceDeviceSamplingResult {
+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 bfc6c6f..97d896c 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
@@ -9,7 +9,7 @@
* @author gonghl
*/
@Data
-public class MonitorResourceResult {
+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 d0b7a5b..2ef6bda 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class MonitoringDetailResult {
+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 7a53baf..70e3bd8 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
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-public class OrganizationTreeResult {
+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 3dbce4c..b7f2c74 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class PicAccessResult {
+public class PicAccessResult extends BaseResult{
/**
* 鏁版嵁绫诲瀷涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝鏁版嵁绫诲瀷涓�2鎴�11鏃惰〃绀轰汉鑴搁噰闆嗚澶囧唴鐮�
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 91b6c63..ce8d7ae 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
@@ -11,7 +11,10 @@
@Data
@Document(collection = "snapshot_data_monitor")
public class SnapshotDataMonitorResult extends BaseResult{
-
+ /**
+ * 鏁版嵁绫诲瀷
+ */
+ private Integer dataType;
/**
* dataType涓�1锛氬崱鍙ｅ唴鐮� dataType涓�2鎴�11锛氶噰闆嗚澶囧唴鐮�
*/
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 c114e9c..ff2cc67 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class SnapshotDelayMonitorResult {
+public class SnapshotDelayMonitorResult extends BaseResult{
/**
* dataType涓�1锛氬崱鍙ｅ唴鐮� dataType涓�2鎴�11锛氶噰闆嗚澶囧唴鐮�
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 eaf9529..d5df741 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
@@ -8,7 +8,7 @@
* @author gonghl
*/
@Data
-public class VehicleDeviceSamplingResult {
+public class VehicleDeviceSamplingResult extends BaseResult{
/**
* 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮�
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
index 93e5fda..033e8b3 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.HK.BaseResult;
import lombok.Data;
import java.util.Date;
@@ -11,7 +12,7 @@
* @since 2024-4-19 11:33:34
*/
@Data
-public class CameraResult {
+public class CameraResult{
/**
* 璁惧缂栫爜锛�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 8e6f1b1..57b2253 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,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.HK.BaseResult;
import lombok.Data;
/**
@@ -9,7 +10,7 @@
* @since 2024-4-19 11:37:30
*/
@Data
-public class OnlineResult {
+public class OnlineResult{
/**
* 琛屾斂鍖哄垝缂栫爜
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..31bdc75 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,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.HK.BaseResult;
import lombok.Data;
import java.util.List;
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 94819a5..d5ac0ac 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,15 +1,17 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.HK.BaseResult;
import lombok.Data;
import java.util.Date;
/**
* 褰曞儚鍙敤鎬�
+ *
* @author gonghl
*/
@Data
-public class RecordMetaDSumResult {
+public class RecordMetaDSumResult{
/**
* 琛屾斂鍖哄煙鍚嶇О
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/VehicleDataMonitorController.java b/ycl-server/src/main/java/com/ycl/platform/controller/VehicleDataMonitorController.java
index c52fd50..744c8ae 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/VehicleDataMonitorController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/VehicleDataMonitorController.java
@@ -30,7 +30,7 @@
/**
* 鏌ヨ鍗″彛杩囪溅鏁版嵁涓�鑷存�у垪琛�
*/
- @PreAuthorize("@ss.hasPermi('platform:platform:list')")
+ @PreAuthorize("@ss.hasPermi('platform:platform:list')")
@GetMapping("/list")
public TableDataInfo list(VehicleDataMonitor vehicleDataMonitor) {
startPage();
@@ -53,7 +53,7 @@
/**
* 鑾峰彇鍗″彛杩囪溅鏁版嵁涓�鑷存�ц缁嗕俊鎭�
*/
- @PreAuthorize("@ss.hasPermi('platform:platform:query')")
+ @PreAuthorize("@ss.hasPermi('platform:platform:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Integer id) {
return success(vehicleDataMonitorService.selectVehicleDataMonitorById(id));
@@ -62,7 +62,7 @@
/**
* 鏂板鍗″彛杩囪溅鏁版嵁涓�鑷存��
*/
- @PreAuthorize("@ss.hasPermi('platform:platform:add')")
+ @PreAuthorize("@ss.hasPermi('platform:platform:add')")
@Log(title = "鍗″彛杩囪溅鏁版嵁涓�鑷存��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody VehicleDataMonitor vehicleDataMonitor) {
@@ -72,7 +72,7 @@
/**
* 淇敼鍗″彛杩囪溅鏁版嵁涓�鑷存��
*/
- @PreAuthorize("@ss.hasPermi('platform:platform:edit')")
+ @PreAuthorize("@ss.hasPermi('platform:platform:edit')")
@Log(title = "鍗″彛杩囪溅鏁版嵁涓�鑷存��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody VehicleDataMonitor vehicleDataMonitor) {
@@ -82,7 +82,7 @@
/**
* 鍒犻櫎鍗″彛杩囪溅鏁版嵁涓�鑷存��
*/
- @PreAuthorize("@ss.hasPermi('platform:platform:remove')")
+ @PreAuthorize("@ss.hasPermi('platform:platform:remove')")
@Log(title = "鍗″彛杩囪溅鏁版嵁涓�鑷存��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Integer[] ids) {
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 5424408..b85b2e2 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -1,24 +1,24 @@
package com.ycl.task;
import com.alibaba.fastjson2.JSONObject;
-import com.ycl.platform.domain.param.HK.FaceDeviceInspectionParam;
-import com.ycl.platform.domain.param.HK.SnapshotDataMonitorParam;
-import com.ycl.platform.domain.param.HK.VehicleDeviceInspectionParam;
-import com.ycl.platform.domain.result.HK.BaseResult;
-import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
-import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
-import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.mongodb.client.result.DeleteResult;
+import com.ycl.platform.domain.param.HK.*;
+import com.ycl.platform.domain.result.HK.*;
import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.platform.service.ICheckIndexFaceService;
import com.ycl.platform.service.ICheckIndexVideoService;
import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import com.ycl.feign.HKClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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 org.springframework.util.unit.DataUnit;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -46,10 +46,13 @@
public void VehicleDeviceInspectionTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(getToday());
+ param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.VehicleDeviceInspection(param);
List<VehicleDeviceInspectionResult> list = getDataList(jsonObject, VehicleDeviceInspectionResult.class, "杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(list)) {
+ //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria.where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, VehicleDeviceInspectionResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(list);
//鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
@@ -62,13 +65,17 @@
public void FaceDeviceInspectionTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
- param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(getToday());
+ param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
JSONObject jsonObject = hkClient.FaceDeviceInspection(param);
List<FaceDeviceInspectionResult> list = getDataList(jsonObject, FaceDeviceInspectionResult.class, "浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(list)) {
+ //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria.where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, FaceDeviceInspectionResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(list);
//鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
+ //TODO:鍙兘鏈夐噸澶嶅伐鍗�
ywThresholdService.faceCheck(list);
}
log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
@@ -80,28 +87,36 @@
log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�");
/** 杞﹁締鏁版嵁 */
SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam();
- carParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(getToday()).setDataType(ApiConstants.HK_DATATYPE_CAR);
+ carParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_CAR);
JSONObject carJsonObject = hkClient.SnapshotDataMonitor(carParam);
List<SnapshotDataMonitorResult> carList = getDataList(carJsonObject, SnapshotDataMonitorResult.class, "杞﹁締鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹�");
if (!CollectionUtils.isEmpty(carList)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
+ .and("dataType").is(ApiConstants.HK_DATATYPE_CAR));
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
+ carList.forEach(item->item.setDataType(ApiConstants.HK_DATATYPE_CAR));
mongoTemplate.insert(carList);
- //TODO:杞﹁締鐐逛綅鍦ㄧ嚎鐜�
- checkIndexCarService.siteOnline(carList);
}
/** 浜鸿劯鏁版嵁 */
SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
- faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(getToday()).setDataType(ApiConstants.HK_DATATYPE_FACE);
+ faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DATATYPE_FACE);
JSONObject faceJsonObject = hkClient.SnapshotDataMonitor(carParam);
- List list = getDataList(faceJsonObject, SnapshotDataMonitorResult.class, "浜鸿劯鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹负绌�");
- if (!CollectionUtils.isEmpty(list)) {
+ List<SnapshotDataMonitorResult> faceList = getDataList(faceJsonObject, SnapshotDataMonitorResult.class, "浜鸿劯鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹负绌�");
+ if (!CollectionUtils.isEmpty(faceList)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
+ .and("dataType").is(ApiConstants.HK_DATATYPE_FACE));
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(list);
- //TODO:浜鸿劯鐐逛綅鍦ㄧ嚎鐜�
- checkIndexFaceService.siteOnline(list);
+ carList.forEach(item->item.setDataType(ApiConstants.HK_DATATYPE_FACE));
+ mongoTemplate.insert(faceList);
}
-
+ //TODO:宸ュ崟
log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
}
@@ -109,11 +124,47 @@
//涓�鏈轰竴妗�
public void task2() {
//鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼
+
+ }
+
+ //閲囬泦璁惧灞炴�х洃娴嬬粨鏋�(浜鸿劯)
+ public void monitorDetailTask() {
+ log.info("寮�濮嬫墽琛岄噰闆嗚澶囧睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
+ //閲囬泦璁惧灞炴�х洃娴嬬粨鏋�
+ MonitoringDetailParam param = new MonitoringDetailParam();
+ param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ JSONObject jsonObject = hkClient.monitorDetail(param);
+ List<MonitoringDetailResult> faceList = getDataList(jsonObject, MonitoringDetailResult.class, "閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹负绌�");
+ if (!CollectionUtils.isEmpty(faceList)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(faceList);
+ }
+ //TODO:宸ュ崟澶勭悊
+ log.info("缁撴潫閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
}
//鍗″彛灞炴�х洃娴嬬粨鏋�
- public void task3() {
+ public void crossDetailTask() {
+ log.info("寮�濮嬫墽琛屽崱鍙ｅ睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
+ CrossDetailParam param = new CrossDetailParam();
+ param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
+ JSONObject jsonObject = hkClient.crossDetail(param);
+ List<CrossDetailResult> faceList = getDataList(jsonObject, CrossDetailResult.class, "鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹负绌�");
+ if (!CollectionUtils.isEmpty(faceList)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(faceList);
+ }
+ //TODO:宸ュ崟澶勭悊
+ log.info("缁撴潫鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
}
//鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋�
@@ -141,14 +192,6 @@
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
//杞﹁締鍗″彛璁惧url鍙敤鎬�
- }
-
- //鑾峰彇褰撳墠鏃ユ湡
- private String getToday() {
- Date date = new Date();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- String today = sdf.format(date);
- return today;
}
//瑙ｆ瀽鏁版嵁
--
Gitblit v1.8.0