From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 164 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 135 insertions(+), 29 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 78339cd..3dae6eb 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
@@ -2,17 +2,23 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.entity.YwThreshold;
import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
import com.ycl.platform.mapper.YwThresholdMapper;
import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.platform.service.WorkOrderService;
+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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import utils.DateUtils;
import java.util.*;
@@ -30,6 +36,9 @@
public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
@Autowired
private YwThresholdMapper ywThresholdMapper;
+
+ @Autowired
+ private WorkOrderService workOrderService;
/**
* 鏌ヨ杩愮淮闃堝��
@@ -101,10 +110,40 @@
return ywThresholdMapper.deleteYwThresholdById(id);
}
-
+ /**
+ * 鍒ゆ柇瑙嗛闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
@Override
public void videoCheck(List list) {
+ }
+
+ @Override
+ public void errorTypeCheckUY(List list) {
+ // 骞冲彴绂荤嚎鏁呴殰妫�娴�
+ if (CollectionUtils.isEmpty(list)) {
+ Boolean ping = PingUtil.ping("", 5);
+ if (! ping) {
+
+ }
+ }
+ // 璁惧绂荤嚎鏁呴殰妫�娴�
+
+ // 淇″彿缂哄け鏁呴殰妫�娴�
+
+ // 鐢婚潰鍋忚壊鏁呴殰妫�娴�
+
+ // 闆姳骞叉壈鏁呴殰妫�娴�
+
+ // 鏉＄汗骞叉壈鏁呴殰妫�娴�
+
+ // 鐢婚潰閬尅鏁呴殰妫�娴�
+
+ // 娓呮櫚搴﹀紓甯告娴�
+
+ // 浜害寮傚父鏁呴殰妫�娴�
}
/**
@@ -116,35 +155,54 @@
public void faceCheck(List<FaceDeviceInspectionResult> list) {
Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.FACE.name());
//鍑嗗涓嬪彂宸ュ崟闆嗗悎
- List<FaceDeviceInspectionResult> distributeList = new ArrayList<>();
+ List<WorkOrder> distributeList = new ArrayList<>();
//鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
- List<FaceDeviceInspectionResult> workOrderList = new ArrayList<>();
+ List<WorkOrder> workOrderList = new ArrayList<>();
//澶勭悊鎺ュ彛鏁版嵁
for (FaceDeviceInspectionResult result : list) {
if (result == null) {
log.error("浜鸿劯瀵硅薄鏁版嵁涓虹┖");
continue;
}
+ WorkOrder workOrder = new WorkOrder();
//妫�鏌ユ椂閽熷噯纭巼
Float clockPercent = result.getSnapClock().getClockPercent();
- check(YwThreadConstants.Face_ClockPercent, clockPercent, result, 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, 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, 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, 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, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.FACE_LOW.getValue());
//妫�鏌ュ缓妯″け璐ョ巼
Float failPercent = result.getSnapValidity().getFailPercent();
- check(YwThreadConstants.Face_FailPercent, failPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ 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 (WorkOrderStatusEnum.WAIT_DISTRIBUTE.equals(workOrder.getStatus())) {
+ workOrderList.add(workOrder);
+ } else if (WorkOrderStatusEnum.DISTRIBUTED.equals(workOrder.getStatus())) {
+ distributeList.add(workOrder);
+ }
}
- //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
+ /** 娣诲姞宸ュ崟 */
+ workOrderService.innerAddWorkOrder(workOrderList);
+ workOrderService.innerAddWorkOrder(distributeList);
}
/**
@@ -156,38 +214,62 @@
public void carCheck(List<VehicleDeviceInspectionResult> list) {
Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.CAR.name());
//鍑嗗涓嬪彂宸ュ崟闆嗗悎
- List<VehicleDeviceInspectionResult> distributeList = new ArrayList<>();
+ List<WorkOrder> distributeList = new ArrayList<>();
//鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
- List<VehicleDeviceInspectionResult> workOrderList = new ArrayList<>();
+ List<WorkOrder> workOrderList = new ArrayList<>();
//澶勭悊鎺ュ彛鏁版嵁
for (VehicleDeviceInspectionResult result : list) {
if (result == null) {
log.error("杞﹁締瀵硅薄鏁版嵁涓虹┖");
continue;
}
+ WorkOrder workOrder = new WorkOrder();
//妫�鏌ユ寔缁棤鏁版嵁澶╂暟
Integer continueNoDataCount = result.getContinueNoDataCount();
- check(YwThreadConstants.Car_ContinueNoDataCount, continueNoDataCount, result, 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, 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, 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, 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, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
- //杞﹁締鍏」灞炴�т笉瀹屾暣閲�
- Integer noIntegrityCountResult = result.getIntegrity().getNoIntegrityCount();
- check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result, 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().getMainNoIntegrityCount();
+ 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);
+ }
}
- //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
+ /** 娣诲姞宸ュ崟 */
+ workOrderService.innerAddWorkOrder(workOrderList);
+ workOrderService.innerAddWorkOrder(distributeList);
}
- //灏佽闃堝�间负map
+ /**
+ * 鎶婇槇鍊兼潯浠舵煡鍑烘潵锛岃浆鎴恗ap
+ *
+ * @param name
+ * @return
+ */
private Map<String, YwThreshold> getYwThresholdMap(String name) {
return ywThresholdMapper.selectList(
new QueryWrapper<YwThreshold>().eq("monitor_type", name)
@@ -197,8 +279,18 @@
));
}
- //妫�鏌ラ槇鍊�
- private <T extends Comparable<T>> void check(String key, T value, Object result, Map<String, YwThreshold> thresholds, List distributeList, List workOrderList, CompareType compareType) {
+ /**
+ * 妫�鏌ラ槇鍊�
+ *
+ * @param key 鏌愰槇鍊兼爣璇�
+ * @param value 鎺ュ彛鑾峰彇鍒扮殑鍊�
+ * @param serialNumber 鍥芥爣鐮�
+ * @param thresholds 闃堝�兼潯浠秏ap
+ * @param compareType 姣旇緝鏂瑰紡锛�>= <=
+ * @param errorType 鏁呴殰绫诲瀷
+ * @param <T>
+ */
+ 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);
@@ -207,15 +299,29 @@
T thresholdAutoValue = parseThreshold(ywThreshold.getValue(), value.getClass());
//姣旇緝澶у皬锛屽姞鍏ュ埌瀵瑰簲寰呭鐞嗛泦鍚�
if (compareType.compare(v, thresholdAutoValue)) {
- workOrderList.add(result);
+ //鑷姩涓嬪彂宸ュ崟
+ workOrder.setSerialNumber(serialNumber);
+ workOrder.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
+ workOrder.setErrorTypeList(new ArrayList<>());
+ workOrder.getErrorTypeList().add(errorType);
+ } else {
+ workOrder.getErrorTypeList().add(errorType);
+ }
} else if (compareType.compare(v, thresholdValue)) {
- distributeList.add(result);
+ //杩涘叆宸ュ崟浠ｄ笅鍙�
+ workOrder.setSerialNumber(serialNumber);
+ workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
+ workOrder.setErrorTypeList(new ArrayList<>());
+ workOrder.getErrorTypeList().add(errorType);
+ } else {
+ workOrder.getErrorTypeList().add(errorType);
+ }
}
},
- () -> log.error("{} 涓虹┖: {}", thresholds.get(key).getName(), result)
+ () -> log.error("{} 涓虹┖: {}", thresholds.get(key).getName(), serialNumber)
);
-
-
}
private <T extends Comparable<T>> T parseThreshold(String thresholdStr, Class<?> type) {
--
Gitblit v1.8.0