From 9a4549c0c2dbe44c9568fe56fb4df8d6fbb44d4f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 19 八月 2024 16:33:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
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 79123b7..00b346a 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -43,42 +43,46 @@
//杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
public void vehicleDeviceInspectionTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
- param.setPageNo(ApiConstants.PageNo);
- param.setPageSize(ApiConstants.HKPageSize);
- param.setDate(DateUtils.getDate());
- param.setDataType(ApiConstants.HK_DataType_CAR);
- List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehFullAmount/query", param, VehicleDeviceInspectionResult.class);
- if (!CollectionUtils.isEmpty(list)) {
- //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, VehicleDeviceInspectionResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(list);
- //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
- ywThresholdService.carCheck(list);
- }
+// VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
+// param.setPageNo(ApiConstants.PageNo);
+// param.setPageSize(ApiConstants.HKPageSize);
+// param.setDate(DateUtils.getDate());
+// param.setDataType(ApiConstants.HK_DataType_CAR);
+// List<VehicleDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehFullAmount/query", param, VehicleDeviceInspectionResult.class);
+// if (!CollectionUtils.isEmpty(list)) {
+// //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, VehicleDeviceInspectionResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(list);
+// //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
+// ywThresholdService.carCheck(list);
+// }
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ ywThresholdService.carCheck(mongoTemplate.find(query, VehicleDeviceInspectionResult.class));
log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
//浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
public void faceDeviceInspectionTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
- param.setPageNo(ApiConstants.PageNo);
- param.setPageSize(ApiConstants.HKPageSize);
- param.setDate(DateUtils.getDate());
- List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceFullAmount/query", param, FaceDeviceInspectionResult.class);
- if (!CollectionUtils.isEmpty(list)) {
- //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, FaceDeviceInspectionResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insertAll(list);
- //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
- //TODO:鍙兘鏈夐噸澶嶅伐鍗�
- ywThresholdService.faceCheck(list);
- }
+// FaceDeviceInspectionParam param = new FaceDeviceInspectionParam();
+// param.setPageNo(ApiConstants.PageNo);
+// param.setPageSize(ApiConstants.HKPageSize);
+// param.setDate(DateUtils.getDate());
+// List<FaceDeviceInspectionResult> list = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceFullAmount/query", param, FaceDeviceInspectionResult.class);
+// if (!CollectionUtils.isEmpty(list)) {
+// //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+// Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+// DeleteResult result = mongoTemplate.remove(query, FaceDeviceInspectionResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(list);
+// //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
+// //TODO:鍙兘鏈夐噸澶嶅伐鍗�
+// ywThresholdService.faceCheck(list);
+// }
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ ywThresholdService.faceCheck(mongoTemplate.find(query, FaceDeviceInspectionResult.class));
log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
--
Gitblit v1.8.0