From cb7d99d810f2356096b67fbccd3fac556e638d83 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 22 八月 2024 11:22:56 +0800
Subject: [PATCH] feat：查询条件优化
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 119 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 40 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 adb6cba..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,37 +43,46 @@
//杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
public void vehicleDeviceInspectionTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- VehicleDeviceInspectionParam param = new VehicleDeviceInspectionParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
- 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).setPageSize(ApiConstants.PageSize).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("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
}
@@ -83,7 +92,10 @@
log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�");
/** 杞﹁締鏁版嵁 */
SnapshotDataMonitorParam carParam = new SnapshotDataMonitorParam();
- carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ carParam.setPageNo(ApiConstants.PageNo);
+ carParam.setPageSize(ApiConstants.HKPageSize);
+ carParam.setDate(DateUtils.getDate());
+ carParam.setDataType(ApiConstants.HK_DataType_CAR);
List<SnapshotDataMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", carParam, SnapshotDataMonitorResult.class);
if (!CollectionUtils.isEmpty(carList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -98,7 +110,10 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDataMonitorParam faceParam = new SnapshotDataMonitorParam();
- faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
+ faceParam.setPageNo(ApiConstants.PageNo);
+ faceParam.setPageSize(ApiConstants.HKPageSize);
+ faceParam.setDate(DateUtils.getDate());
+ faceParam.setDataType(ApiConstants.HK_DataType_FACE);
List<SnapshotDataMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapCountDetail/query", faceParam, SnapshotDataMonitorResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -119,7 +134,9 @@
log.info("寮�濮嬫墽琛岄噰闆嗚澶囧睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
MonitoringDetailParam param = new MonitoringDetailParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
List<MonitoringDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/cameraExpDetailInfo/query", param, MonitoringDetailResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -138,7 +155,9 @@
log.info("寮�濮嬫墽琛屽崱鍙ｅ睘鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
CrossDetailParam param = new CrossDetailParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
List<CrossDetailResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/crossExpDetailInfo/query", param, CrossDetailResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -157,7 +176,10 @@
log.info("寮�濮嬫墽琛屾暟鎹畬鏁存�х洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�
DataIntegrityMonitoringParam param = new DataIntegrityMonitoringParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<DataIntegrityMonitoringResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeIntegrity/query", param, DataIntegrityMonitoringResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -177,7 +199,10 @@
log.info("寮�濮嬫墽琛屽睘鎬ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�
AttrRecognitionParam param = new AttrRecognitionParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<AttrRecognitionMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/attributeRecognition/query", param, AttrRecognitionMonitorResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -199,7 +224,10 @@
//杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
/** 杞﹁締鏁版嵁 */
SnapshotDelayMonitorParam carParam = new SnapshotDelayMonitorParam();
- carParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ carParam.setPageNo(ApiConstants.PageNo);
+ carParam.setPageSize(ApiConstants.HKPageSize);
+ carParam.setDate(DateUtils.getDate());
+ carParam.setDataType(ApiConstants.HK_DataType_CAR);
List<SnapshotDelayMonitorResult> carList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", carParam, SnapshotDelayMonitorResult.class);
if (!CollectionUtils.isEmpty(carList)) {
@@ -207,7 +235,7 @@
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
.and("dataType").is(ApiConstants.HK_DataType_CAR));
- DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
mongoTemplate.insertAll(carList);
@@ -215,17 +243,20 @@
/** 浜鸿劯鏁版嵁 */
SnapshotDelayMonitorParam faceParam = new SnapshotDelayMonitorParam();
- faceParam.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_FACE);
- List<SnapshotDelayMonitorParam> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorParam.class);
+ faceParam.setPageNo(ApiConstants.PageNo);
+ faceParam.setPageSize(ApiConstants.HKPageSize);
+ faceParam.setDate(DateUtils.getDate());
+ faceParam.setDataType(ApiConstants.HK_DataType_FACE);
+ List<SnapshotDelayMonitorResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))
.and("dataType").is(ApiConstants.HK_DataType_FACE));
- DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
+ DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
+ faceList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟
@@ -237,7 +268,10 @@
log.info("寮�濮嬫墽琛屽浘鐗囪闂洃娴嬬粨鏋滄暟鎹悓姝�");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
PicAccessParam param = new PicAccessParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate()).setDataType(ApiConstants.HK_DataType_CAR);
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<PicAccessResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/picAccessDetail/query", param, PicAccessResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -256,7 +290,10 @@
log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
//杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜囥�佽溅杈嗗崱鍙ｈ澶噓rl鍙敤鎬�
VehicleDeviceSamplingParam param = new VehicleDeviceSamplingParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
+ param.setDataType(ApiConstants.HK_DataType_CAR);
List<VehicleDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/vehSampleAmount/query", param, VehicleDeviceSamplingResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
@@ -276,7 +313,9 @@
public void faceDeviceSamplingTask() {
log.info("寮�濮嬫墽琛屼汉鑴歌澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
FaceDeviceSamplingParam param = new FaceDeviceSamplingParam();
- param.setPageNO(ApiConstants.PageNo).setPageSize(ApiConstants.PageSize).setDate(DateUtils.getDate());
+ param.setPageNo(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.HKPageSize);
+ param.setDate(DateUtils.getDate());
List<FaceDeviceSamplingResult> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceSampleAmount/query", param, FaceDeviceSamplingResult.class);
if (!CollectionUtils.isEmpty(faceList)) {
--
Gitblit v1.8.0