From d1e30de4ca5e1c198df2edd0394779f93ae80f64 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 29 八月 2024 14:59:10 +0800 Subject: [PATCH] 定时任务注释解开 --- ycl-server/src/main/java/com/ycl/task/HKTask.java | 96 ++++++------------ ycl-server/src/main/java/com/ycl/task/UYTask.java | 190 +++++++++++++++++++------------------- 2 files changed, 129 insertions(+), 157 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 6072c95..a002bcf 100644 --- a/ycl-server/src/main/java/com/ycl/task/HKTask.java +++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java @@ -43,46 +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); -// } - Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); - ywThresholdService.carCheck(mongoTemplate.find(query, VehicleDeviceInspectionResult.class)); + 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); -// } - Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); - ywThresholdService.faceCheck(mongoTemplate.find(query, FaceDeviceInspectionResult.class)); + 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("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾"); } @@ -329,34 +329,6 @@ } //TODO:宸ュ崟澶勭悊 log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾"); - } - - //娴嬭瘯 - public void test() { - log.info("娴嬭瘯娴峰悍鎺ュ彛"); - HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/faceDetect/query", new FaceDeviceSamplingParam(), Object.class); - log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�"); - } - - //娴嬭瘯 - public void test1() { - log.info("娴嬭瘯娴峰悍鎺ュ彛"); - HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/coordinateExpInfo/query", new FaceDeviceSamplingParam(), Object.class); - log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�"); - } - - //娴嬭瘯 - public void test2() { - log.info("娴嬭瘯娴峰悍鎺ュ彛"); - HkApiUtil.sendAPI("/api/dqd/service/rs/v1/device/gbCodeExpInfo/query", new FaceDeviceSamplingParam(), Object.class); - log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�"); - } - - //娴嬭瘯 - public void test3() { - log.info("娴嬭瘯娴峰悍鎺ュ彛"); - HkApiUtil.sendAPI("/api/dqd/service/rs/v2/data/passDetect/query", new FaceDeviceSamplingParam(), Object.class); - log.info("缁撴潫->{}锛岃皟鐢ㄦ垚鍔�"); } //瑙f瀽鏁版嵁 diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java index 3241096..0dd9e2e 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -106,37 +106,37 @@ // 涓�鏈轰竴妗f敞鍐岀巼 // 妗f鑰冩牳姣� log.info("寮�濮嬫墽琛屼竴鏈轰竴妗e悎鏍肩巼鏁版嵁鍚屾"); -// MonitorQualifyParam param = new MonitorQualifyParam(); -// param.setPageNum(ApiConstants.PageNo); -// param.setPageSize(ApiConstants.PageSize); -// JSONObject jsonObject = uyClient.monitorQualify(param); -// if (jsonObject != null) { -// String code = jsonObject.getString("code"); -// if (ApiConstants.UYSuccessCodeStr.equals(code)) { -// JSONObject data = jsonObject.getJSONObject("data"); -// if (data != null) { -// List<MonitorQualifyResult> records = data.getList("records", MonitorQualifyResult.class); -// if (!CollectionUtils.isEmpty(records)) { -// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 -// Query query = new Query(Criteria -// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); -// DeleteResult result = mongoTemplate.remove(query, MonitorQualifyResult.class); -// //瀛樻斁鍦╩ongo涓� -// mongoTemplate.insertAll(records); -// // 宸ュ崟鐢熸垚 -// uyErrorTypeCheckService.monitorQualifyCheck(records); -// } else { -// log.error("涓�鏈轰竴妗e悎鏍肩巼鏁版嵁涓虹┖{}", data); -// } -// } -// } else { -// log.error("涓�鏈轰竴妗e悎鏍肩巼鏁版嵁涓虹┖{}", jsonObject); -// } -// } else { -// log.error("涓�鏈轰竴妗e悎鏍肩巼鏁版嵁涓虹┖"); -// } - Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); - uyErrorTypeCheckService.monitorQualifyCheck(mongoTemplate.find(query, MonitorQualifyResult.class)); + MonitorQualifyParam param = new MonitorQualifyParam(); + param.setPageNum(ApiConstants.PageNo); + param.setPageSize(ApiConstants.PageSize); + JSONObject jsonObject = uyClient.monitorQualify(param); + if (jsonObject != null) { + String code = jsonObject.getString("code"); + if (ApiConstants.UYSuccessCodeStr.equals(code)) { + JSONObject data = jsonObject.getJSONObject("data"); + if (data != null) { + List<MonitorQualifyResult> records = data.getList("records", MonitorQualifyResult.class); + if (!CollectionUtils.isEmpty(records)) { + //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, MonitorQualifyResult.class); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insertAll(records); + // 宸ュ崟鐢熸垚 + uyErrorTypeCheckService.monitorQualifyCheck(records); + } else { + log.error("涓�鏈轰竴妗e悎鏍肩巼鏁版嵁涓虹┖{}", data); + } + } + } else { + log.error("涓�鏈轰竴妗e悎鏍肩巼鏁版嵁涓虹┖{}", jsonObject); + } + } else { + log.error("涓�鏈轰竴妗e悎鏍肩巼鏁版嵁涓虹┖"); + } +// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); +// uyErrorTypeCheckService.monitorQualifyCheck(mongoTemplate.find(query, MonitorQualifyResult.class)); log.info("缁撴潫涓�鏈轰竴妗e悎鏍肩巼鏁版嵁鍚屾"); } @@ -144,42 +144,42 @@ public void videoOnlineTask() { //瑙嗛鍥惧儚璐ㄩ噺 log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�"); -// VideoOnlineParam param = new VideoOnlineParam(); -// param.setPageNum(ApiConstants.PageNo); -// param.setPageSize(ApiConstants.PageSize); -// param.setArealayerno(ApiConstants.AreaNo); -// param.setStatus(ApiConstants.UY_OnlineStatus_All); -// param.setIcmpStatus(ApiConstants.UY_OnlineStatus_All); -// JSONObject jsonObject = uyClient.videoOnline(param); -// if (jsonObject != null) { -// Integer statusCode = jsonObject.getInteger("statusCode"); -// if (ApiConstants.UYSuccessCode.equals(statusCode)) { -// JSONObject data = jsonObject.getJSONObject("data"); -// if (data != null) { -// List<VideoOnlineResult> records = data.getList("records", VideoOnlineResult.class); -// if (!CollectionUtils.isEmpty(records)) { -// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 -// Query query = new Query(Criteria -// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); -// DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class); -// //瀛樻斁鍦╩ongo涓� -// mongoTemplate.insertAll(records); -// // 宸ュ崟鐢熸垚 -// uyErrorTypeCheckService.videoOnlineCheck(records); -// } else { -// log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data); -// } -// } else { -// log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", jsonObject); -// } -// } else { -// log.error("鐐逛綅鍦ㄧ嚎缁撴灉璇锋眰澶辫触{}", jsonObject); -// } -// } else { -// log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖"); -// } - Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); - uyErrorTypeCheckService.videoOnlineCheck(mongoTemplate.find(query, VideoOnlineResult.class)); + VideoOnlineParam param = new VideoOnlineParam(); + param.setPageNum(ApiConstants.PageNo); + param.setPageSize(ApiConstants.PageSize); + param.setArealayerno(ApiConstants.AreaNo); + param.setStatus(ApiConstants.UY_OnlineStatus_All); + param.setIcmpStatus(ApiConstants.UY_OnlineStatus_All); + JSONObject jsonObject = uyClient.videoOnline(param); + if (jsonObject != null) { + Integer statusCode = jsonObject.getInteger("statusCode"); + if (ApiConstants.UYSuccessCode.equals(statusCode)) { + JSONObject data = jsonObject.getJSONObject("data"); + if (data != null) { + List<VideoOnlineResult> records = data.getList("records", VideoOnlineResult.class); + if (!CollectionUtils.isEmpty(records)) { + //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insertAll(records); + // 宸ュ崟鐢熸垚 + uyErrorTypeCheckService.videoOnlineCheck(records); + } else { + log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data); + } + } else { + log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", jsonObject); + } + } else { + log.error("鐐逛綅鍦ㄧ嚎缁撴灉璇锋眰澶辫触{}", jsonObject); + } + } else { + log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖"); + } +// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); +// uyErrorTypeCheckService.videoOnlineCheck(mongoTemplate.find(query, VideoOnlineResult.class)); log.info("缁撴潫鎵ц鐐逛綅鍦ㄧ嚎鏁版嵁鍚屾"); } @@ -187,34 +187,34 @@ public void recordMetaDSumTask() { //褰曞儚鍙敤鐜� log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�"); -// RecordMetaDSumParam param = new RecordMetaDSumParam(); -// param.setTenantId(tenantId); -// Calendar instance = Calendar.getInstance(); -// instance.setTime(new Date()); -// instance.add(Calendar.DAY_OF_MONTH, -1); -// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); -// String yesterday = format.format(instance.getTime()); -// param.setStatTime(yesterday); -// JSONObject jsonObject = uyClient.recordMetaDSumList(param); -// if (jsonObject != null) { -// if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) { -// List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class); -// if (!CollectionUtils.isEmpty(records)) { -// //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 -// Query query = new Query(Criteria -// .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); -// DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class); -// //瀛樻斁鍦╩ongo涓� -// mongoTemplate.insertAll(records); -// // 宸ュ崟鐢熸垚 -// uyErrorTypeCheckService.recordMetaDSumCheck(records); -// } -// } else { -// log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject); -// } -// } - Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); - uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class)); + RecordMetaDSumParam param = new RecordMetaDSumParam(); + param.setTenantId(tenantId); + Calendar instance = Calendar.getInstance(); + instance.setTime(new Date()); + instance.add(Calendar.DAY_OF_MONTH, -1); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String yesterday = format.format(instance.getTime()); + param.setStatTime(yesterday); + JSONObject jsonObject = uyClient.recordMetaDSumList(param); + if (jsonObject != null) { + if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) { + List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class); + if (!CollectionUtils.isEmpty(records)) { + //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insertAll(records); + // 宸ュ崟鐢熸垚 + uyErrorTypeCheckService.recordMetaDSumCheck(records); + } + } else { + log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject); + } + } +// Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date()))); +// uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class)); log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾"); } -- Gitblit v1.8.0