From c221aef40109fe7296450bd51b872ce51ee3e59c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 05 八月 2024 17:31:43 +0800
Subject: [PATCH] 补充车辆抽检接口
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 47 +++++++++++------------
ycl-server/src/main/java/com/ycl/feign/FeignErrorDecoder.java | 1
ycl-server/src/main/java/com/ycl/feign/HKClient.java | 22 +++++-----
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 2
ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java | 1
5 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/feign/FeignErrorDecoder.java b/ycl-server/src/main/java/com/ycl/feign/FeignErrorDecoder.java
index 077d2af..025ee71 100644
--- a/ycl-server/src/main/java/com/ycl/feign/FeignErrorDecoder.java
+++ b/ycl-server/src/main/java/com/ycl/feign/FeignErrorDecoder.java
@@ -40,6 +40,7 @@
break;
}
log.error(msg);
+ log.error(response.reason());
return new FeignException(msg);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/feign/HKClient.java b/ycl-server/src/main/java/com/ycl/feign/HKClient.java
index 101a7cd..ecb06bb 100644
--- a/ycl-server/src/main/java/com/ycl/feign/HKClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/HKClient.java
@@ -127,7 +127,7 @@
* @return 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/data/snapCountDetail/query")
- JSONObject SnapshotDataMonitor(@RequestBody SnapshotDataMonitorParam param);
+ JSONObject snapshotDataMonitor(@RequestBody SnapshotDataMonitorParam param);
/**
* 鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉
@@ -143,7 +143,7 @@
* @return 鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v1/data/snapAgingDetail/query")
- JSONObject SnapshotDelayMonitor(@RequestBody SnapshotDelayMonitorParam param);
+ JSONObject snapshotDelayMonitor(@RequestBody SnapshotDelayMonitorParam param);
/**
* 鍥剧墖璁块棶鐩戞祴缁撴灉
@@ -154,7 +154,7 @@
* @return 鍥剧墖璁块棶鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v1/data/picAccessDetail/query")
- JSONObject PicAccessMonitor(@RequestBody PicAccessParam param);
+ JSONObject picAccessMonitor(@RequestBody PicAccessParam param);
/**
* 灞炴�ц瘑鍒噯纭洃娴嬬粨鏋�
@@ -164,7 +164,7 @@
* @return 灞炴�ц瘑鍒噯纭洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/data/attributeRecognition/query")
- JSONObject AttrRecognitionMonitor(@RequestBody AttrRecognitionParam param);
+ JSONObject attrRecognitionMonitor(@RequestBody AttrRecognitionParam param);
/**
* 鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋�
@@ -178,7 +178,7 @@
* @return 鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋�
*/
@PostMapping("/dqd/service/rs/v1/data/attributeIntegrity/query")
- JSONObject DataIntegrityMonitoring(@RequestBody DataIntegrityMonitoringParam param);
+ JSONObject dataIntegrityMonitoring(@RequestBody DataIntegrityMonitoringParam param);
/**
* 浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
@@ -189,7 +189,7 @@
* @return 浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/faceFullAmount/query")
- JSONObject FaceDeviceInspection(@RequestBody FaceDeviceInspectionParam param);
+ JSONObject faceDeviceInspection(@RequestBody FaceDeviceInspectionParam param);
/**
* 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
@@ -200,7 +200,7 @@
* @return 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/faceSampleAmount/query")
- JSONObject FaceDeviceSampling(@RequestBody FaceDeviceSamplingParam param);
+ JSONObject faceDeviceSampling(@RequestBody FaceDeviceSamplingParam param);
/**
* 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
@@ -211,7 +211,7 @@
* @return 杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/vehFullAmount/query")
- JSONObject VehicleDeviceInspection(@RequestBody VehicleDeviceInspectionParam param);
+ JSONObject vehicleDeviceInspection(@RequestBody VehicleDeviceInspectionParam param);
/**
* 杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
@@ -222,7 +222,7 @@
* @return 杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
*/
@PostMapping("/dqd/service/rs/v2/data/vehSampleAmount/query")
- JSONObject VehicleDeviceSampling(@RequestBody VehicleDeviceSamplingParam param);
+ JSONObject vehicleDeviceSampling(@RequestBody VehicleDeviceSamplingParam param);
/**
* 鍏虫敞鐩戞祴璧勬簮鏌ヨ
@@ -239,7 +239,7 @@
* @return 鎸囨爣閰嶇疆淇℃伅鏌ヨ
*/
@GetMapping("/dqd/service/rs/v1/statistics/criteria/query")
- JSONObject Criteria();
+ JSONObject criteria();
/**
* 缁勭粐鏍戞煡璇�
@@ -247,5 +247,5 @@
* @return 缁勭粐鏍戞煡璇�
*/
@PostMapping("/dqd/service/rs/v1/orgInfo/standard/query")
- JSONObject OrganizationTree(@RequestBody OrganizationTreeParam param);
+ JSONObject organizationTree(@RequestBody OrganizationTreeParam param);
}
diff --git a/ycl-server/src/main/java/com/ycl/feign/UYClient.java b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
index 18f8ede..17a3026 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -78,6 +78,6 @@
* @param param
* @return
*/
- @PostMapping(value = "/tenant/api/vi/user/login",headers = "No-Need-To-Token = true")
+ @PostMapping(value = "/tenant/api/vi/user/login",headers = "No-Need-To-Token=true")
JSONObject getToken(@RequestBody UYTokenParam param);
}
diff --git a/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java b/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
index b2337c8..e7b5b1c 100644
--- a/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
+++ b/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
@@ -9,6 +9,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
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 376f750..8cf4f0b 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -46,7 +46,7 @@
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
- JSONObject jsonObject = hkClient.VehicleDeviceInspection(param);
+ JSONObject jsonObject = hkClient.vehicleDeviceInspection(param);
List<VehicleDeviceInspectionResult> list = getDataList(jsonObject, VehicleDeviceInspectionResult.class, "杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(list)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -65,7 +65,7 @@
log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
- JSONObject jsonObject = hkClient.FaceDeviceInspection(param);
+ JSONObject jsonObject = hkClient.faceDeviceInspection(param);
List<FaceDeviceInspectionResult> list = getDataList(jsonObject, FaceDeviceInspectionResult.class, "浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(list)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -87,7 +87,7 @@
/** 杞﹁締鏁版嵁 */
SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam();
carParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
- JSONObject carJsonObject = hkClient.SnapshotDataMonitor(carParam);
+ JSONObject carJsonObject = hkClient.snapshotDataMonitor(carParam);
List<SnapshotDataMonitorResult> carList = getDataList(carJsonObject, SnapshotDataMonitorResult.class, "杞﹁締鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹�");
if (!CollectionUtils.isEmpty(carList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -103,7 +103,7 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
- JSONObject faceJsonObject = hkClient.SnapshotDataMonitor(carParam);
+ JSONObject faceJsonObject = hkClient.snapshotDataMonitor(carParam);
List<SnapshotDataMonitorResult> faceList = getDataList(faceJsonObject, SnapshotDataMonitorResult.class, "浜鸿劯鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -165,7 +165,7 @@
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�
DataIntegrityMonitoringParam param = new DataIntegrityMonitoringParam();
param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
- JSONObject jsonObject = hkClient.DataIntegrityMonitoring(param);
+ JSONObject jsonObject = hkClient.dataIntegrityMonitoring(param);
List<DataIntegrityMonitoringResult> faceList = getDataList(jsonObject, DataIntegrityMonitoringResult.class, "鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -185,7 +185,7 @@
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�
AttrRecognitionParam param = new AttrRecognitionParam();
param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
- JSONObject jsonObject = hkClient.AttrRecognitionMonitor(param);
+ JSONObject jsonObject = hkClient.attrRecognitionMonitor(param);
List<AttrRecognitionMonitorResult> faceList = getDataList(jsonObject, AttrRecognitionMonitorResult.class, "灞炴�ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -207,7 +207,7 @@
/** 杞﹁締鏁版嵁 */
SnapshotDelayMonitorParam carParam = new SnapshotDelayMonitorParam();
carParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
- JSONObject carJsonObject = hkClient.SnapshotDelayMonitor(carParam);
+ JSONObject carJsonObject = hkClient.snapshotDelayMonitor(carParam);
List<SnapshotDelayMonitorResult> carList = getDataList(carJsonObject, SnapshotDelayMonitorResult.class, "杞﹁締鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹�");
if (!CollectionUtils.isEmpty(carList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -223,7 +223,7 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDelayMonitorParam faceParam = new SnapshotDelayMonitorParam();
faceParam.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
- JSONObject faceJsonObject = hkClient.SnapshotDelayMonitor(faceParam);
+ JSONObject faceJsonObject = hkClient.snapshotDelayMonitor(faceParam);
List<SnapshotDelayMonitorParam> faceList = getDataList(faceJsonObject, SnapshotDelayMonitorParam.class, "浜鸿劯鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹负绌�");
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -240,12 +240,12 @@
}
//鍥剧墖璁块棶鐩戞祴缁撴灉
- public void PicAccessTask() {
+ public void picAccessTask() {
log.info("寮�濮嬫墽琛屽浘鐗囪闂洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
PicAccessParam param = new PicAccessParam();
param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
- JSONObject jsonObject = hkClient.PicAccessMonitor(param);
+ JSONObject jsonObject = hkClient.picAccessMonitor(param);
List<PicAccessResult> faceList = getDataList(jsonObject, PicAccessResult.class, "鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -258,34 +258,33 @@
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
}
-
- //浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
- public void Face() {
- log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+ public void vehicleDeviceSamplingTask() {
+ log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
- FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
+ VehicleDeviceSamplingParam param = new VehicleDeviceSamplingParam();
param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
- JSONObject jsonObject = hkClient.FaceDeviceSampling(param);
- List<FaceDeviceSamplingResult> faceList = getDataList(jsonObject, FaceDeviceSamplingResult.class, "浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
+ JSONObject jsonObject = hkClient.vehicleDeviceSampling(param);
+ List<VehicleDeviceSamplingResult> faceList = getDataList(jsonObject, VehicleDeviceSamplingResult.class, "浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, FaceDeviceSamplingResult.class);
+ DeleteResult result = mongoTemplate.remove(query, VehicleDeviceSamplingResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(faceList);
}
//TODO:宸ュ崟澶勭悊
- log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ log.info("缁撴潫杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
- //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
- public void FaceDeviceSamplingTask() {
- log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- //杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
+
+ //浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+ public void faceDeviceSamplingTask() {
+ log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
param.setPageNO(ApiConstants.pageNo).setPageSize(ApiConstants.pageSize).setDate(DateUtils.getDate());
- JSONObject jsonObject = hkClient.FaceDeviceSampling(param);
+ JSONObject jsonObject = hkClient.faceDeviceSampling(param);
List<FaceDeviceSamplingResult> faceList = getDataList(jsonObject, FaceDeviceSamplingResult.class, "浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
--
Gitblit v1.8.0