From d96427842163d9f2539576b737e38c2cc49ff87b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 18 七月 2024 15:10:19 +0800
Subject: [PATCH] 对接接口调整
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java | 15 +-
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java | 4
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java | 13 +-
ycl-server/src/main/java/com/ycl/web/HKClient.java | 7
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java | 2
ycl-server/src/main/java/com/ycl/interceptor/HKFeignInterceptor.java | 14 ++
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java | 2
ycl-server/src/main/java/com/ycl/task/HKTask.java | 94 ++++++++++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java | 1
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java | 2
ycl-server/src/main/java/com/ycl/config/HKFeignConfig.java | 15 +++
ycl-server/src/main/resources/application-dev.yml | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/OrganizationTreeParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java | 2
ycl-server/src/main/java/com/ycl/config/YYFeignConfig.java | 15 +++
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java | 1
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java | 2
ycl-server/src/main/java/com/ycl/web/UYClient.java | 4
ycl-server/src/main/java/com/ycl/PlatformApplication.java | 3
ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/BaseResult.java | 17 +++
ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java | 14 ++
31 files changed, 218 insertions(+), 33 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java
index adf9bc6..bc5fed6 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/AttrRecognitionParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java
index fa7a465..f21174a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CarDetectParam.java
@@ -32,7 +32,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 鐩戞祴璧勬簮 鈥� 缂栧彿锛堝叧娉ㄧ洃娴嬭祫婧愭煡璇㈡帴鍙ｈ幏鍙栵級銆傛煡璇㈡寚瀹氱洃娴嬭祫婧愪笅鐨勬墍鏈夎澶囨垨鍗″彛璇︽儏
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java
index ca45d6b..0ac7e1e 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CodeByAreaParam.java
@@ -38,7 +38,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 閲囬泦璁惧绫诲瀷锛�1銆佹墍鏈夐噰闆嗚澶囷紱2銆佷汉鑴搁噰闆嗚澶囷紱3銆佽溅杈嗛噰闆嗚澶囷紱4銆佸叾浠栭噰闆嗚澶囥�備笉浼狅紝榛樿鏌ヨ鎵�鏈夐噰闆嗚澶囥��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java
index d3c7f85..fea7a60 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CoordinateByAreaParam.java
@@ -38,7 +38,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 閲囬泦璁惧绫诲瀷锛�1銆佹墍鏈夐噰闆嗚澶囷紱2銆佷汉鑴搁噰闆嗚澶囷紱3銆佽溅杈嗛噰闆嗚澶囷紱4銆佸叾浠栭噰闆嗚澶囥�備笉浼狅紝榛樿鏌ヨ鎵�鏈夐噰闆嗚澶囥�傛鍙傛暟鍦╠eviceType涓�1鍗抽噰闆嗚澶囨椂鏈夋晥銆�
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java
index 1744d14..d8a2f40 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/CrossDetailParam.java
@@ -32,7 +32,7 @@
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java
index 14bb229..db825be 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/DataIntegrityMonitoringParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java
index 59913e1..ff9df40 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDetectParam.java
@@ -32,7 +32,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 鐩戞祴璧勬簮 鈥� 缂栧彿锛堝叧娉ㄧ洃娴嬭祫婧愭煡璇㈡帴鍙ｈ幏鍙栵級銆傛煡璇㈡寚瀹氱洃娴嬭祫婧愪笅鐨勬墍鏈夎澶囨垨鍗″彛璇︽儏
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java
index a86181a..b50aefd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceInspectionParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java
index d7299ba..064d9b2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/FaceDeviceSamplingParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java
index c43c71b..7832498 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/MonitoringDetailParam.java
@@ -32,7 +32,7 @@
/**
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/OrganizationTreeParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/OrganizationTreeParam.java
index e8d5aa4..afa8ea1 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/OrganizationTreeParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/OrganizationTreeParam.java
@@ -21,7 +21,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java
index 291bcab..64cbae5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/PicAccessParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java
index 7f74467..49f1b0f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDataMonitorParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 鐩戞祴璧勬簮 鈥� 缂栧彿锛堝叧娉ㄧ洃娴嬭祫婧愭煡璇㈡帴鍙ｈ幏鍙栵級銆傛煡璇㈡寚瀹氱洃娴嬭祫婧愪笅鐨勬墍鏈夎澶囨垨鍗″彛璇︽儏
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java
index dff3e1d..a4250a2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/SnapshotDelayMonitorParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 绫诲瀷:1銆佸崱鍙ｈ繃杞︽暟鎹紱2銆佷汉鑴告暟鎹紱11銆佽澶囪繃杞︽暟鎹�
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java
index dbb8ca5..724f276 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceInspectionParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java
index fa623c8..9c13f7f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/HK/VehicleDeviceSamplingParam.java
@@ -33,7 +33,7 @@
* 鏃ユ湡锛氶渶瑕佸摢澶╃殑寮傚父鏁版嵁銆傛牸寮忥細yyyy-mm-dd
* 蹇呭～
*/
- private Date date;
+ private String date;
/**
* 缁勭粐缂栧彿锛屾煡璇㈣缁勭粐鍙婂叾鎵�鏈夌洿灞炰笅绾у紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夌粍缁囧紓甯告儏鍐点��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
index 30e6c76..6cd1fac 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/CheckTemplateQuery.java
@@ -89,6 +89,7 @@
private Short frequency;
/** 鑰冩牳鎻忚堪 */
private String description;
+
/** 鑰冩牳瑙勫垯 */
private List<Map<String,Object>> ruleFormList;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/BaseResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/BaseResult.java
new file mode 100644
index 0000000..48d2cae
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/BaseResult.java
@@ -0,0 +1,17 @@
+package com.ycl.platform.domain.result.HK;
+
+import lombok.Data;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.Id;
+
+import java.util.Date;
+
+@Data
+public class BaseResult {
+ @Id
+ private ObjectId id;
+ /**
+ * 鏁版嵁鏃ユ湡
+ */
+ private Date createTime;
+}
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 60cdc7c..fd2b8e6 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
@@ -1,6 +1,7 @@
package com.ycl.platform.domain.result.HK;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉锛�2.3.0鐗堟湰鏂板
@@ -8,7 +9,8 @@
* @author gonghl
*/
@Data
-public class FaceDeviceInspectionResult {
+@Document(collection = "face_device_inspection")
+public class FaceDeviceInspectionResult extends BaseResult{
/**
* 璁惧鍚嶇О
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 41a32a3..fdb3827 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
@@ -1,6 +1,7 @@
package com.ycl.platform.domain.result.HK;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉锛�2.3.0鐗堟湰鏂板
@@ -8,17 +9,19 @@
* @author gonghl
*/
@Data
-public class VehicleDeviceInspectionResult {
+@Document(collection = "vehicle_device_inspection")
+public class VehicleDeviceInspectionResult extends BaseResult{
+
+ /**
+ * 璁惧缂栧彿锛宒ataType涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮�
+ */
+ private String externalIndexCode;
/**
* 璁惧鍚嶇О
*/
private String deviceName;
- /**
- * 璁惧缂栧彿锛宒ataType涓�1鏃惰〃绀哄崱鍙ｅ唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮�
- */
- private String externalIndexCode;
/**
* 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮�
diff --git a/ycl-server/src/main/java/com/ycl/PlatformApplication.java b/ycl-server/src/main/java/com/ycl/PlatformApplication.java
index 242b7ba..c3654cd 100644
--- a/ycl-server/src/main/java/com/ycl/PlatformApplication.java
+++ b/ycl-server/src/main/java/com/ycl/PlatformApplication.java
@@ -2,15 +2,18 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@Slf4j
@EnableCaching
@EnableTransactionManagement
@EnableFeignClients(basePackages = {"com.ycl.web"})
+@ImportAutoConfiguration({FeignAutoConfiguration.class})
@SpringBootApplication
public class PlatformApplication {
public static void main(String[] args) {
diff --git a/ycl-server/src/main/java/com/ycl/config/HKFeignConfig.java b/ycl-server/src/main/java/com/ycl/config/HKFeignConfig.java
new file mode 100644
index 0000000..b446168
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/config/HKFeignConfig.java
@@ -0,0 +1,15 @@
+package com.ycl.config;
+
+import com.ycl.interceptor.HKFeignInterceptor;
+import feign.RequestInterceptor;
+import org.springframework.context.annotation.Bean;
+
+public class HKFeignConfig {
+ /**
+ * 娉ㄥ叆鎷︽埅鍣�
+ */
+ @Bean
+ public RequestInterceptor requestInterceptor(){
+ return new HKFeignInterceptor();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/config/YYFeignConfig.java b/ycl-server/src/main/java/com/ycl/config/YYFeignConfig.java
new file mode 100644
index 0000000..c24cc7b
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/config/YYFeignConfig.java
@@ -0,0 +1,15 @@
+package com.ycl.config;
+
+import com.ycl.interceptor.YYFeignInterceptor;
+import feign.RequestInterceptor;
+import org.springframework.context.annotation.Bean;
+
+public class YYFeignConfig {
+ /**
+ * 娉ㄥ叆鎷︽埅鍣�
+ */
+ @Bean
+ public RequestInterceptor requestInterceptor(){
+ return new YYFeignInterceptor();
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/interceptor/HKFeignInterceptor.java b/ycl-server/src/main/java/com/ycl/interceptor/HKFeignInterceptor.java
new file mode 100644
index 0000000..6d9b19c
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/interceptor/HKFeignInterceptor.java
@@ -0,0 +1,14 @@
+package com.ycl.interceptor;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+/**
+ * 娴峰悍璇锋眰鎷︽埅鍣�
+ */
+public class HKFeignInterceptor implements RequestInterceptor {
+ @Override
+ public void apply(RequestTemplate requestTemplate) {
+
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java b/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
new file mode 100644
index 0000000..4db9bd0
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
@@ -0,0 +1,14 @@
+package com.ycl.interceptor;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+/**
+ * 浼樹簯璇锋眰鎷︽埅鍣�
+ */
+public class YYFeignInterceptor implements RequestInterceptor {
+ @Override
+ public void apply(RequestTemplate requestTemplate) {
+ requestTemplate.header("token", "auth");
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
index ddce8d5..21359bf 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
@@ -98,6 +98,7 @@
@PutMapping("/weight")
public AjaxResult editWeight(@RequestBody CheckTemplateRule checkTemplateRule)
{
+
return toAjax(checkTemplateRuleService.updateCheckTemplateRule(checkTemplateRule));
}
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java
index 5fe1377..2250efd 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateRuleServiceImpl.java
@@ -11,7 +11,7 @@
/**
* 鑰冩牳妯℃澘-瑙勫垯涓棿Service涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
* @date 2024-04-01
*/
@@ -23,7 +23,7 @@
/**
* 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿
- *
+ *
* @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
* @return 鑰冩牳妯℃澘-瑙勫垯涓棿
*/
@@ -35,7 +35,7 @@
/**
* 鏌ヨ鑰冩牳妯℃澘-瑙勫垯涓棿鍒楄〃
- *
+ *
* @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
* @return 鑰冩牳妯℃澘-瑙勫垯涓棿
*/
@@ -47,7 +47,7 @@
/**
* 鏂板鑰冩牳妯℃澘-瑙勫垯涓棿
- *
+ *
* @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
* @return 缁撴灉
*/
@@ -59,19 +59,20 @@
/**
* 淇敼鑰冩牳妯℃澘-瑙勫垯涓棿
- *
+ *
* @param checkTemplateRule 鑰冩牳妯℃澘-瑙勫垯涓棿
* @return 缁撴灉
*/
@Override
public int updateCheckTemplateRule(CheckTemplateRule checkTemplateRule)
{
+
return checkTemplateRuleMapper.updateCheckTemplateRule(checkTemplateRule);
}
/**
* 鎵归噺鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
* @return 缁撴灉
*/
@@ -83,7 +84,7 @@
/**
* 鍒犻櫎鑰冩牳妯℃澘-瑙勫垯涓棿淇℃伅
- *
+ *
* @param id 鑰冩牳妯℃澘-瑙勫垯涓棿涓婚敭
* @return 缁撴灉
*/
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
new file mode 100644
index 0000000..2f4ae43
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -0,0 +1,94 @@
+package com.ycl.task;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ycl.platform.domain.param.HK.FaceDeviceInspectionParam;
+import com.ycl.platform.domain.param.HK.VehicleDeviceInspectionParam;
+import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
+import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.ycl.web.HKClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+
+@Slf4j
+@Component("HKTask")
+public class HKTask {
+
+ @Autowired
+ private MongoTemplate mongoTemplate;
+
+ @Autowired
+ private HKClient hkClient;
+
+ private final static Integer pageNo = 1;
+ private final static Integer pageSize = 5000;
+ //鎴愬姛鐘舵�佺爜
+ private final static String successCode = "0";
+
+ //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
+ public void VehicleDeviceInspectionTask() {
+ log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
+ param.setPageNO(pageNo).setPageSize(pageSize).setDate(getToday());
+ JSONObject jsonObject = hkClient.VehicleDeviceInspection(param);
+ if (jsonObject != null && successCode.equals(jsonObject.getString("code"))) {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data == null) {
+ throw new RuntimeException("杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+ }
+ List<VehicleDeviceInspectionResult> list = data.getList("list", VehicleDeviceInspectionResult.class);
+ list.forEach(item ->item.setCreateTime(new Date()));
+ if (CollectionUtils.isEmpty(list)) {
+ throw new RuntimeException("杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+ }
+ //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
+
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(list);
+ } else {
+ log.error("鍚屾杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
+ }
+ log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ }
+
+
+ public void FaceDeviceInspectionTask() {
+ log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
+ param.setPageNO(pageNo).setPageSize(pageSize).setDate(getToday());
+ JSONObject jsonObject = hkClient.FaceDeviceInspection(param);
+ if (jsonObject != null && successCode.equals(jsonObject.getString("code"))) {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data == null) {
+ throw new RuntimeException("浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+ }
+ List<FaceDeviceInspectionResult> list = data.getList("list", FaceDeviceInspectionResult.class);
+ list.forEach(item ->item.setCreateTime(new Date()));
+ if (CollectionUtils.isEmpty(list)) {
+ throw new RuntimeException("浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+ }
+ //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
+
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(list);
+ } else {
+ log.error("鍚屾浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
+ }
+ log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ }
+
+
+ private String getToday() {
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String today = sdf.format(date);
+ return today;
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/web/HKClient.java b/ycl-server/src/main/java/com/ycl/web/HKClient.java
index 543153c..af6f745 100644
--- a/ycl-server/src/main/java/com/ycl/web/HKClient.java
+++ b/ycl-server/src/main/java/com/ycl/web/HKClient.java
@@ -1,6 +1,7 @@
package com.ycl.web;
import com.alibaba.fastjson2.JSONObject;
+import com.ycl.config.HKFeignConfig;
import com.ycl.platform.domain.param.HK.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
@@ -13,7 +14,7 @@
*/
@Component
-@FeignClient(name = "HKClient", url = "${request.haiKangDomain}")
+@FeignClient(name = "HKClient", url = "${request.haiKangDomain}", configuration = HKFeignConfig.class)
public interface HKClient {
/**
@@ -188,7 +189,7 @@
* @return 浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/faceFullAmount/query")
- JSONObject DataIntegrityMonitoring(FaceDeviceInspectionParam param);
+ JSONObject FaceDeviceInspection(FaceDeviceInspectionParam param);
/**
* 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
@@ -199,7 +200,7 @@
* @return 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/faceSampleAmount/query")
- JSONObject DataIntegrityMonitoring(FaceDeviceSamplingParam param);
+ JSONObject FaceDeviceSampling(FaceDeviceSamplingParam param);
/**
* 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
diff --git a/ycl-server/src/main/java/com/ycl/web/UYClient.java b/ycl-server/src/main/java/com/ycl/web/UYClient.java
index 2f158cb..e66f4ef 100644
--- a/ycl-server/src/main/java/com/ycl/web/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/web/UYClient.java
@@ -1,6 +1,8 @@
package com.ycl.web;
import com.alibaba.fastjson2.JSONObject;
+import com.ycl.config.HKFeignConfig;
+import com.ycl.config.YYFeignConfig;
import com.ycl.platform.domain.param.YY.CameraParam;
import com.ycl.platform.domain.param.YY.OnlineParam;
import com.ycl.platform.domain.param.YY.RecordMetaDSumParam;
@@ -15,7 +17,7 @@
*/
@Component
-@FeignClient(name = "UYClient", url = "${request.youYunDomain}")
+@FeignClient(name = "UYClient", url = "${request.youYunDomain}", configuration = YYFeignConfig.class)
public interface UYClient {
/**
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index babd523..ff8109b 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -123,4 +123,6 @@
host: 42.193.1.25
database: zgyw
port: 27017
+ username: admin
+ password: ycl@202466
--
Gitblit v1.8.0