From 1ffc844e3483cd3ac7cc73b5fb17c62e09d1ff2f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 10:54:34 +0800
Subject: [PATCH] 工单取图像查询工单范围调整、分页图片查询
---
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
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 da0bd99..ba79174 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
@@ -5,6 +5,7 @@
import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.utils.uuid.IdUtils;
+import constant.ApiConstants;
import enumeration.ErrorType;
import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
@@ -33,42 +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()
+ List<WorkOrder> workOrderList = dataList.stream().filter(item -> -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;
@@ -134,19 +130,18 @@
@Override
- public void osdCheck(List<PyOsdResult> dataList) {
+ public void osdCheck(List<OsdCheckResult> dataList) {
List<WorkOrder> workOrderList = dataList.stream().map(item -> {
WorkOrder workOrder = new WorkOrder();
// osd鏃堕棿
- if (!item.getCheckTime().equals(item.getSetTime())) {
+ if (!ApiConstants.OSD_Correct.equals(item.getOsdTimeCorrect())) {
this.genWorkOrder(workOrder, ErrorType.CLOCK_SKEW, item.getDeviceNo());
}
// osd淇℃伅
- if (!"璁剧疆姝ｇ‘".equals(item.getOsd1Province())
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1City()))
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1Part()))
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1TimeFormat()))
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1OSD()))
+ if (!ApiConstants.OSD_Correct.equals(item.getOsdProvinceCorrect())
+ || (!ApiConstants.OSD_Correct.equals(item.getOsdCityCorrect()))
+ || (!ApiConstants.OSD_Correct.equals(item.getOsdPartCorrect()))
+ || (!ApiConstants.OSD_Correct.equals(item.getOsdNameCorrect()))
) {
this.genWorkOrder(workOrder, ErrorType.OSD_ERROR, item.getDeviceNo());
}
@@ -164,7 +159,7 @@
*/
private void genWorkOrder(WorkOrder workOrder, ErrorType errorType, String serialNumber) {
if (! StringUtils.hasText(workOrder.getWorkOrderNo())) {
- workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
+ workOrder.setWorkOrderNo(IdUtils.randomNO());
}
if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
workOrder.setErrorTypeList(new ArrayList<>());
--
Gitblit v1.8.0