From 93de88509eddd4af2622e480da57236f8af177a1 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 15:51:22 +0800
Subject: [PATCH] 图像检测bug修改
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java | 12 +++---
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 22 ++++------
ycl-server/src/main/java/com/ycl/task/UYTask.java | 70 +++++++++++++++++-----------------
3 files changed, 50 insertions(+), 54 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java
index 79b84c9..4186382 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java
@@ -37,7 +37,7 @@
private Integer blurRaw;
/**
- * 鐢婚潰鍋忚壊锛�1姝ｅ父 0寮傚父
+ * 鐢婚潰鍋忚壊锛�1姝ｅ父 0鏈煡 -1寮傚父
*/
private Integer color;
@@ -65,7 +65,7 @@
private String ipAddr;
/**
- * 浜害锛�1姝ｅ父 0寮傚父
+ * 浜害锛�1姝ｅ父 0鏈煡 -1寮傚父
*/
private Integer light;
@@ -92,7 +92,7 @@
private Integer olTotal;
/**
- * 鐢婚潰閬尅锛�1姝ｅ父 0寮傚父
+ * 鐢婚潰閬尅锛�1姝ｅ父 0鏈煡 -1寮傚父
*/
private Integer shade;
@@ -106,7 +106,7 @@
private Integer shakeRaw;
/**
- * 淇″彿鐘舵�侊細鍦ㄧ嚎锛�0寮傚父
+ * 淇″彿鐘舵�侊細1姝ｅ父 0鏈煡 -1寮傚父
*/
private Integer signa1;
@@ -122,7 +122,7 @@
private Integer sipCode;
/**
- * 闆姳骞叉壈锛�1姝ｅ父 0寮傚父
+ * 闆姳骞叉壈锛�1姝ｅ父 0鏈煡 -1寮傚父
*/
private Integer snow;
@@ -135,7 +135,7 @@
private Integer status;
/**
- * 鏉＄汗骞叉壈锛�1姝ｅ父 0寮傚父
+ * 鏉＄汗骞叉壈锛�1姝ｅ父 0鏈煡 -1寮傚父
*/
private Integer stripe;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
index 78fd917..d62ea12 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
@@ -34,41 +34,37 @@
@Override
public void imageDetectionCheck(List<ImageDetectionResult> dataList) {
List<WorkOrder> workOrderList = dataList.stream().filter(item -> 0 == item.getSigna1()
- || 0 == item.getColor()
- || 0 == item.getSnow()
- || 0 == item.getStripe()
- || 0 == item.getShade()
- || 0 == item.getBlur()
- || 0 == item.getLight()
+ || -1 == item.getSignal()
+ || -1 == item.getImage()
)
.map(item -> {
WorkOrder workOrder = new WorkOrder();
// 淇″彿缂哄け
- if (0 == item.getSigna1() ) {
+ if (-1 == item.getSigna1() ) {
this.genWorkOrder(workOrder, ErrorType.SIGNAL_LOSS, item.getDeviceId());
}
// 鐢婚潰鍋忚壊
- if ( 0 == item.getColor()) {
+ if (-1 == item.getColor()) {
this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId());
}
// 闆姳骞叉壈
- if ( 0 == item.getSnow()) {
+ if (-1 == item.getSnow()) {
this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId());
}
// 鏉＄汗骞叉壈
- if (0 == item.getStripe()) {
+ if (-1 == item.getStripe()) {
this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId());
}
// 鐢婚潰閬尅
- if (0 == item.getShade()) {
+ if (-1 == item.getShade()) {
this.genWorkOrder(workOrder, ErrorType.SCREEN_OCCLUSION, item.getDeviceId());
}
// 娓呮櫚搴﹀紓甯�
- if (0 == item.getBlur()) {
+ if (-1 == item.getBlur()) {
this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId());
}
// 浜害寮傚父
- if (0 == item.getLight()) {
+ if (-1 == item.getLight()) {
this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId());
}
return workOrder;
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 0dd9e2e..b910d85 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -62,41 +62,41 @@
// 鍥惧儚妫�娴�
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));
+ 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("缁撴潫鎵ц鍥惧儚鐩戞祴鏁版嵁鍚屾");
}
--
Gitblit v1.8.0