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/UYTask.java | 222 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 147 insertions(+), 75 deletions(-)
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 7534569..1313214 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -4,12 +4,14 @@
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
import com.ycl.platform.domain.param.UY.*;
+import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
import com.ycl.platform.domain.result.UY.OneMachineFileResult;
import com.ycl.platform.domain.result.UY.OsdMonitorResult;
-import com.ycl.platform.domain.result.UY.QueryVqdResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
@@ -18,10 +20,15 @@
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -38,125 +45,190 @@
private IYwThresholdService ywThresholdService;
@Autowired
private ITMonitorService monitorService;
+ @Autowired
+ private UYErrorTypeCheckService uyErrorTypeCheckService;
+
@Value("${youYun.tenantId}")
private String tenantId;
+ @Value("${youYun.apikey}")
+ private String apikey;
+ @Value("${youYun.accesskey}")
+ private String accesskey;
@Value("${youYun.email}")
private String email;
@Value("${youYun.passwd}")
private String passwd;
+
+ // 鍥惧儚妫�娴�
+ public void imageDetection() {
+ log.info("寮�濮嬫墽琛屽浘鍍忔娴嬫暟鎹悓姝�");
+// ImageDetectionParam param = new ImageDetectionParam();
+// param.setPageNum(ApiConstants.PageNo);
+// param.setPageSize(ApiConstants.PageSize);
+// param.setArealayerno(ApiConstants.AreaNo);
+// JSONObject jsonObject = uyClient.imageDetection(param);
+// if (jsonObject != null) {
+// log.info("鏁版嵁鏍煎紡" + jsonObject);
+// Integer statusCode = jsonObject.getInteger("statusCode");
+// if (ApiConstants.UYSuccessCode.equals(statusCode)) {
+// JSONObject data = jsonObject.getJSONObject("data");
+// if (data != null) {
+// List<ImageDetectionResult> records = data.getList("records", ImageDetectionResult.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, ImageDetectionResult.class);
+// //瀛樻斁鍦╩ongo涓�
+// mongoTemplate.insertAll(records);
+// // 宸ュ崟鐢熸垚
+// uyErrorTypeCheckService.imageDetectionCheck(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.imageDetectionCheck(mongoTemplate.find(query, ImageDetectionResult.class));
+ log.info("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾");
+ }
+
//涓�鏈轰竴妗�
- public void monitorTask() {
+ public void monitorQualifyTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
// 涓�鏈轰竴妗ｆ敞鍐岀巼
// 妗ｆ鑰冩牳姣�
- log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｆ暟鎹悓姝�");
- OneMachineFileParam param = new OneMachineFileParam();
- JSONObject jsonObject = uyClient.oneMachineFile(param);
- if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
- JSONObject cameraList = jsonObject.getJSONObject("CameraList");
- if (cameraList != null) {
- List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class);
- if (!CollectionUtils.isEmpty(data)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(data);
- } else {
- log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
- }
- } else {
- log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", jsonObject);
- }
- } else {
- log.error("涓�鏈轰竴妗ｆ暟鎹负绌�");
- }
- log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
+ log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
+// 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("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", data);
+// }
+// }
+// } else {
+// log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", jsonObject);
+// }
+// } else {
+// log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖");
+// }
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ uyErrorTypeCheckService.monitorQualifyCheck(mongoTemplate.find(query, MonitorQualifyResult.class));
+ log.info("缁撴潫涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
}
- //鍥惧儚鐩戞祴璇婃柇缁撴灉
- public void queryVqdResultTask() {
- //鐐逛綅鍦ㄧ嚎鐜�
+ //鐐逛綅鍦ㄧ嚎鐜�
+ public void videoOnlineTask() {
//瑙嗛鍥惧儚璐ㄩ噺
- log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�");
- QueryVqdParam param = new QueryVqdParam();
- param.setTenantId(tenantId);
- JSONObject jsonObject = uyClient.queryVqdResult(param);
+ 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) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
Integer statusCode = jsonObject.getInteger("statusCode");
if (ApiConstants.UYSuccessCode.equals(statusCode)) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
- List<QueryVqdResult> records = data.getList("records", QueryVqdResult.class);
+ 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, QueryVqdResult.class);
+ DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(records);
+ mongoTemplate.insertAll(records);
+ // 宸ュ崟鐢熸垚
+ uyErrorTypeCheckService.videoOnlineCheck(records);
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", jsonObject);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉璇锋眰澶辫触{}", jsonObject);
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉璇锋眰澶辫触{}", jsonObject);
}
} else {
- log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖");
+ log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖");
}
- log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾");
+ Query query = new Query(Criteria.where("mongoCreateTime").lt(DateUtils.getDayEnd(new Date())));
+ uyErrorTypeCheckService.videoOnlineCheck(mongoTemplate.find(query, VideoOnlineResult.class));
+ log.info("缁撴潫鎵ц鐐逛綅鍦ㄧ嚎鏁版嵁鍚屾");
}
//褰曞儚鍙敤
public void recordMetaDSumTask() {
//褰曞儚鍙敤鐜�
log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
- RecordMetaDSumParam param = new RecordMetaDSumParam();
- param.setTenantId(tenantId);
- JSONObject jsonObject = uyClient.recordMetaDSumList(param);
- if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
- if (jsonObject.getBoolean("success")) {
- JSONObject data = jsonObject.getJSONObject("data");
- if (data != null) {
- List<RecordMetaDSumResult> records = data.getList("records", 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.insert(records);
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", data);
- }
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
- }
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
- }
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖");
- }
+// 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("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
+
//瑙嗛鏍囨敞
public void OsdMonitorTask() {
//瑙嗛鏍囨敞
log.info("寮�濮嬫墽琛岃棰戞爣娉ㄦ暟鎹悓姝�");
OsdMonitorParam param = new OsdMonitorParam();
- JSONObject jsonObject = uyClient.osdMonitorList(param,tenantId);
+ param.setPageNum(ApiConstants.PageNo);
+ param.setPageSize(ApiConstants.PageSize);
+ JSONObject jsonObject = uyClient.osdMonitorList(param, tenantId);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
- if (jsonObject.getBoolean("success")) {
+ if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
List<OsdMonitorResult> records = data.getList("records", OsdMonitorResult.class);
@@ -166,7 +238,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, OsdMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(records);
+ mongoTemplate.insertAll(records);
} else {
log.error("瑙嗛鏍囨敞鏁版嵁涓虹┖{}", data);
}
--
Gitblit v1.8.0