From 8af39d20413790b72658675f3182714cc59011b3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 17:37:31 +0800
Subject: [PATCH] 工单检测生成优化、海康阈值校验优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 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 34df3f5..c04c859 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
@@ -12,6 +12,7 @@
import com.ycl.utils.ip.PingUtil;
import constant.YwThreadConstants;
import enumeration.CompareType;
+import enumeration.ErrorType;
import enumeration.general.BusinessTypeEnum;
import enumeration.general.WorkOrderStatusEnum;
import lombok.extern.slf4j.Slf4j;
@@ -163,24 +164,41 @@
log.error("浜鸿劯瀵硅薄鏁版嵁涓虹┖");
continue;
}
+ WorkOrder workOrder = new WorkOrder();
//妫�鏌ユ椂閽熷噯纭巼
Float clockPercent = result.getSnapClock().getClockPercent();
- check(YwThreadConstants.Face_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ check(YwThreadConstants.Face_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.CLOCK_RIGHT.getValue());
//妫�鏌ユ暟鎹強鏃剁巼
Float timelyPercent = result.getSnapTimely().getTimelyPercent();
- check(YwThreadConstants.Face_TimelyPercent, timelyPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ check(YwThreadConstants.Face_TimelyPercent, timelyPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.DATA_TIMELY_ERROR.getValue());
//妫�鏌ユ寔缁棤鏁版嵁澶╂暟
Integer continueNoDataCount = result.getContinueNoDataCount();
- check(YwThreadConstants.Face_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ check(YwThreadConstants.Face_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.LONG_DAY_NO_DATA.getValue());
//妫�鏌ヤ笉鍞竴鏁版嵁閲�
Integer nouniqueCount = result.getSnapUnique().getNouniqueCount();
- check(YwThreadConstants.Face_NouniqueCount, nouniqueCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ check(YwThreadConstants.Face_NouniqueCount, nouniqueCount, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.NOT_UNIQUE_DATA_VOLUME.getValue());
//妫�鏌ヤ汉鑴镐綆璇勫垎鐜�
Float lowScorePercent = result.getSnapValidity().getLowScorePercent();
- check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.FACE_LOW.getValue());
//妫�鏌ュ缓妯″け璐ョ巼
Float failPercent = result.getSnapValidity().getFailPercent();
- check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_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 (WorkOrderStatusEnum.WAIT_DISTRIBUTE.equals(workOrder.getStatus())) {
+ workOrderList.add(workOrder);
+ } else if (WorkOrderStatusEnum.DISTRIBUTED.equals(workOrder.getStatus())) {
+ distributeList.add(workOrder);
+ }
}
/** 娣诲姞宸ュ崟 */
workOrderService.innerAddWorkOrder(workOrderList);
@@ -205,24 +223,41 @@
log.error("杞﹁締瀵硅薄鏁版嵁涓虹┖");
continue;
}
+ WorkOrder workOrder = new WorkOrder();
//妫�鏌ユ寔缁棤鏁版嵁澶╂暟
Integer continueNoDataCount = result.getContinueNoDataCount();
- check(YwThreadConstants.Car_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ check(YwThreadConstants.Car_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.LONG_DAY_NO_DATA.getValue());
//妫�鏌ユ椂閽熷噯纭巼
Float clockPercent = result.getSnapClock().getClockPercent();
- check(YwThreadConstants.Car_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ check(YwThreadConstants.Car_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.CLOCK_RIGHT.getValue());
//妫�鏌ユ暟鎹強鏃剁巼
Float timelyPercentResult = result.getSnapTimely().getTimelyPercent();
- check(YwThreadConstants.Car_TimelyPercent, timelyPercentResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ check(YwThreadConstants.Car_TimelyPercent, timelyPercentResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.DATA_TIMELY_ERROR.getValue());
//妫�鏌ヤ笉鍞竴鏁版嵁閲�
Integer nouniqueCountResult = result.getSnapUnique().getNouniqueCount();
- check(YwThreadConstants.Car_NouniqueCount, nouniqueCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ check(YwThreadConstants.Car_NouniqueCount, nouniqueCountResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.NOT_UNIQUE_DATA_VOLUME.getValue());
//妫�鏌ョ櫧澶╂湭璇嗗埆閲�
Integer dayNoNumberCountResult = result.getSnapPlate().getDayNoNumberCount();
- check(YwThreadConstants.Car_DayNoNumberCount, dayNoNumberCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ check(YwThreadConstants.Car_DayNoNumberCount, dayNoNumberCountResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.UNRECOGNIZED_DAY_VOLUME.getValue());
//杞﹁締鍏」灞炴�т笉瀹屾暣閲�
Integer noIntegrityCountResult = result.getIntegrity().getNoIntegrityCount();
- check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_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 (WorkOrderStatusEnum.WAIT_DISTRIBUTE.equals(workOrder.getStatus())) {
+ workOrderList.add(workOrder);
+ } else if (WorkOrderStatusEnum.DISTRIBUTED.equals(workOrder.getStatus())) {
+ distributeList.add(workOrder);
+ }
}
/** 娣诲姞宸ュ崟 */
workOrderService.innerAddWorkOrder(workOrderList);
@@ -251,13 +286,11 @@
* @param value 鎺ュ彛鑾峰彇鍒扮殑鍊�
* @param serialNumber 鍥芥爣鐮�
* @param thresholds 闃堝�兼潯浠秏ap
- * @param distributeList 瑕佷笅鍙戠殑宸ュ崟瀹瑰櫒
- * @param workOrderList 寰呬笅鍙戠殑宸ュ崟瀹瑰櫒
* @param compareType 姣旇緝鏂瑰紡锛�>= <=
* @param errorType 鏁呴殰绫诲瀷
* @param <T>
*/
- private <T extends Comparable<T>> void check(String key, T value, String serialNumber, Map<String, YwThreshold> thresholds, List distributeList, List workOrderList, CompareType compareType,String errorType) {
+ private <T extends Comparable<T>> void check(String key, T value, String serialNumber, Map<String, YwThreshold> thresholds, WorkOrder workOrder, CompareType compareType,String errorType) {
Optional.ofNullable(value).ifPresentOrElse(
v -> {
YwThreshold ywThreshold = thresholds.get(key);
@@ -267,18 +300,24 @@
//姣旇緝澶у皬锛屽姞鍏ュ埌瀵瑰簲寰呭鐞嗛泦鍚�
if (compareType.compare(v, thresholdAutoValue)) {
//鑷姩涓嬪彂宸ュ崟
- WorkOrder workOrder = new WorkOrder();
workOrder.setSerialNumber(serialNumber);
workOrder.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
- workOrder.setErrorType(errorType);
- workOrderList.add(workOrder);
+ if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
+ workOrder.setErrorTypeList(new ArrayList<>());
+ workOrder.getErrorTypeList().add(errorType);
+ } else {
+ workOrder.getErrorTypeList().add(errorType);
+ }
} else if (compareType.compare(v, thresholdValue)) {
//杩涘叆宸ュ崟浠ｄ笅鍙�
- WorkOrder workOrder = new WorkOrder();
workOrder.setSerialNumber(serialNumber);
workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
- workOrder.setErrorType(errorType);
- distributeList.add(workOrder);
+ if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
+ workOrder.setErrorTypeList(new ArrayList<>());
+ workOrder.getErrorTypeList().add(errorType);
+ } else {
+ workOrder.getErrorTypeList().add(errorType);
+ }
}
},
() -> log.error("{} 涓虹┖: {}", thresholds.get(key).getName(), serialNumber)
--
Gitblit v1.8.0