From f6593a5f6f1138abf09a0ee69fc5119fdce412c9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 07 十二月 2024 17:52:07 +0800
Subject: [PATCH] 标签bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 95 +++++++++++++++++++++++++----------------------
1 files changed, 50 insertions(+), 45 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 6d642bd..d238b64 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
@@ -37,6 +37,7 @@
private final WorkOrderService workOrderService;
private final IYwThresholdService ywThresholdService;
+
/**
* 鍥惧儚妫�娴嬬敓鎴愬伐鍗�
*
@@ -45,40 +46,40 @@
@Override
public void imageDetectionCheck(List<ImageDetectionResult> dataList) {
List<WorkOrder> workOrderList = dataList.stream().filter(item -> -1 == item.getSignal()
- || -1 == item.getImage()
- )
- .map(item -> {
- WorkOrder workOrder = new WorkOrder();
- // 淇″彿缂哄け
- if (-1 == item.getSigna1() ) {
- this.genWorkOrder(workOrder, ErrorType.SIGNAL_LOSS, item.getDeviceId());
- }
- // 鐢婚潰鍋忚壊
- if (-1 == item.getColor()) {
- this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId());
- }
- // 闆姳骞叉壈
- if (-1 == item.getSnow()) {
- this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId());
- }
- // 鏉＄汗骞叉壈
- if (-1 == item.getStripe()) {
- this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId());
- }
- // 鐢婚潰閬尅
- if (-1 == item.getShade()) {
- this.genWorkOrder(workOrder, ErrorType.SCREEN_OCCLUSION, item.getDeviceId());
- }
- // 娓呮櫚搴﹀紓甯�
- if (-1 == item.getBlur()) {
- this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId());
- }
+ || -1 == item.getImage()
+ )
+ .map(item -> {
+ WorkOrder workOrder = new WorkOrder();
+ // 淇″彿缂哄け
+ if (-1 == item.getSigna1()) {
+ this.genWorkOrder(workOrder, ErrorType.SIGNAL_LOSS, item.getDeviceId());
+ }
+ // 鐢婚潰鍋忚壊
+ if (-1 == item.getColor()) {
+ this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId());
+ }
+ // 闆姳骞叉壈
+ if (-1 == item.getSnow()) {
+ this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId());
+ }
+ // 鏉＄汗骞叉壈
+ if (-1 == item.getStripe()) {
+ this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId());
+ }
+ // 鐢婚潰閬尅
+ if (-1 == item.getShade()) {
+ this.genWorkOrder(workOrder, ErrorType.SCREEN_OCCLUSION, item.getDeviceId());
+ }
+ // 娓呮櫚搴﹀紓甯�
+ if (-1 == item.getBlur()) {
+ this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId());
+ }
// // 浜害寮傚父
// if (-1 == item.getLight()) {
// this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId());
// }
- return workOrder;
- }).collect(Collectors.toList());
+ return workOrder;
+ }).collect(Collectors.toList());
workOrderService.innerAddWorkOrder(workOrderList);
}
@@ -91,18 +92,22 @@
public void monitorQualifyCheck(List<MonitorQualifyResult> dataList) {
List<WorkOrder> workOrderList = dataList.stream().map(item -> {
WorkOrder workOrder = new WorkOrder();
- if (item.getSerialNumber().getError()
- || item.getCivilCode().getError()
- || item.getIntegrated_device().getError()
- || item.getIp().getError()
- || item.getJkdwlx().getError()
- || item.getLatitude().getError()
- || item.getLongitude().getError()
- || item.getMacdz().getError()
- || item.getSbzt().getError()
- || item.getName().getError()
- || item.getSxjcjqy().getError()
- || item.getSxjgnlx().getError()) {
+ //TODO:寰呬紭浜戜慨澶嶏紝閬垮厤宸ュ崟
+ MonitorQualifyResult.QualifyResult qualifyResult = new MonitorQualifyResult.QualifyResult();
+ qualifyResult.setError(false);
+ item.setIntegrated_device(qualifyResult);
+ if (item.getSerialNumber() == null || item.getSerialNumber().getError() ||
+ item.getCivilCode() == null || item.getCivilCode().getError() ||
+ item.getIntegrated_device() == null || item.getIntegrated_device().getError() ||
+ item.getIp() == null || item.getIp().getError() ||
+ item.getJkdwlx() == null || item.getJkdwlx().getError() ||
+ item.getLatitude() == null || item.getLatitude().getError() ||
+ item.getLongitude() == null || item.getLongitude().getError() ||
+ item.getMacdz() == null || item.getMacdz().getError() ||
+ item.getSbzt() == null || item.getSbzt().getError() ||
+ item.getName() == null || item.getName().getError() ||
+ item.getSxjcjqy() == null || item.getSxjcjqy().getError() ||
+ item.getSxjgnlx() == null || item.getSxjgnlx().getError()) {
this.genWorkOrder(workOrder, ErrorType.POINT_INFO_ERROR, item.getSerialNumber().getValue());
}
return workOrder;
@@ -114,7 +119,7 @@
public void videoOnlineCheck(List<VideoOnlineResult> dataList) {
List<WorkOrder> workOrderList = dataList.stream().map(item -> {
WorkOrder workOrder = new WorkOrder();
- if (ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()) ) {
+ if (ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus())) {
this.genWorkOrder(workOrder, ErrorType.DEVICE_OFFLINE, item.getDeviceId());
}
// else if (0 == item.getStatus()) {
@@ -160,7 +165,7 @@
long checkTime = item.getCheckTime().getTime();
long osdTime = item.getSetTime().getTime();
Long timeDiff = (checkTime - osdTime) / 1000;
- ywThresholdService.check(YwThreadConstants.Video_DiffTime,timeDiff ,item.getDeviceNo(),ywThresholdMap,workOrder,CompareType.MORE_THAN_EQ,ErrorType.CLOCK_SKEW.getValue());
+ ywThresholdService.check(YwThreadConstants.Video_DiffTime, timeDiff, item.getDeviceNo(), ywThresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.CLOCK_SKEW.getValue());
return workOrder;
}).collect(Collectors.toList());
workOrderService.innerAddWorkOrder(workOrderList);
@@ -170,7 +175,7 @@
* 宸ュ崟淇℃伅
*
* @param workOrder
- * @param errorType 鏁呴殰绫诲瀷
+ * @param errorType 鏁呴殰绫诲瀷
* @param serialNumber 鍥芥爣鐮�
*/
private void genWorkOrder(WorkOrder workOrder, ErrorType errorType, String serialNumber) {
--
Gitblit v1.8.0