From 33f5aca685ef1f92c76701fb306ccee94cf7dd41 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 29 八月 2024 14:53:08 +0800 Subject: [PATCH] 线程池关闭 --- ycl-server/src/main/java/com/ycl/task/HKTask.java | 75 ++++++++++++++++++++----------------- 1 files changed, 40 insertions(+), 35 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 bdcda0d..6072c95 100644 --- a/ycl-server/src/main/java/com/ycl/task/HKTask.java +++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java @@ -43,47 +43,51 @@ //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉 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("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾"); } - //鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋� + // 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋� public void snapshotDataMonitorTask() { log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�"); /** 杞﹁締鏁版嵁 */ @@ -231,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); @@ -243,16 +247,16 @@ faceParam.setPageSize(ApiConstants.HKPageSize); faceParam.setDate(DateUtils.getDate()); faceParam.setDataType(ApiConstants.HK_DataType_FACE); - List<SnapshotDelayMonitorParam> faceList = HkApiUtil.sendAPI("/api/dqd/service/rs/v1/data/snapAgingDetail/query", faceParam, SnapshotDelayMonitorParam.class); + 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:宸ュ崟 @@ -281,6 +285,7 @@ //TODO:宸ュ崟澶勭悊 log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾"); } + //杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉 public void vehicleDeviceSamplingTask() { log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾"); -- Gitblit v1.8.0