From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
index a62a22e..8a19b35 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
@@ -228,16 +228,16 @@
check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.MODELING_FAIL.getValue());
}
// 鐐逛綅鍦ㄧ嚎鐜�
- if (2 == result.getSnapResult()) {
- workOrder.setSerialNumber(result.getExternalIndexCode());
- workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
- if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
- workOrder.setErrorTypeList(new ArrayList<>());
- workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
- } else {
- workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
- }
- }
+// if (2 == result.getSnapResult()) {
+// workOrder.setSerialNumber(result.getExternalIndexCode());
+// workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+// if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
+// workOrder.setErrorTypeList(new ArrayList<>());
+// workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
+// } else {
+// workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
+// }
+// }
if (WorkOrderStatusEnum.WAIT_DISTRIBUTE.equals(workOrder.getStatus())) {
workOrderList.add(workOrder);
} else if (WorkOrderStatusEnum.DISTRIBUTED.equals(workOrder.getStatus())) {
@@ -299,16 +299,16 @@
check(YwThreadConstants.Car_NoIntegrityCount, integrityRate, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.CAR_SIX.getValue());
}
// 鐐逛綅鍦ㄧ嚎鐜�
- if (2 == result.getSnapResult()) {
- workOrder.setSerialNumber(result.getExternalIndexCode());
- workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
- if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
- workOrder.setErrorTypeList(new ArrayList<>());
- workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
- } else {
- workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
- }
- }
+// if (2 == result.getSnapResult()) {
+// workOrder.setSerialNumber(result.getExternalIndexCode());
+// workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+// if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
+// workOrder.setErrorTypeList(new ArrayList<>());
+// workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
+// } else {
+// workOrder.getErrorTypeList().add(ErrorType.DEVICE_OFFLINE.getValue());
+// }
+// }
if (WorkOrderStatusEnum.WAIT_DISTRIBUTE.equals(workOrder.getStatus())) {
workOrderList.add(workOrder);
} else if (WorkOrderStatusEnum.DISTRIBUTED.equals(workOrder.getStatus())) {
@@ -666,11 +666,11 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void addBatch(WorkOrderWhite workOrderWhite) {
+ public Result addBatch(WorkOrderWhite workOrderWhite) {
List<String> errorTypeListAdd = workOrderWhite.getErrorTypeList();
List<WorkOrderWhite> whites = workOrderWhiteMapper.selectList();
for (WorkOrderWhite white : whites) {
- List<String> errorTypeList = Arrays.asList(white.getErrorType().split(","));
+ List<String> errorTypeList = new ArrayList<>(Arrays.asList(white.getErrorType().split(",")));
for (String newError : errorTypeListAdd) {
if (errorTypeList.contains(newError)) {
continue;
@@ -684,6 +684,7 @@
workOrderWhiteMapper.deleteAll();
workOrderWhiteMapper.insertBatch(whites);
}
+ return Result.ok();
}
private <T extends Comparable<T>> T parseThreshold(String thresholdStr, Class<?> type) {
--
Gitblit v1.8.0