From d6f915ecc8ee7efd5fcd3a205b57ef490b918fa5 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 21 八月 2024 14:27:59 +0800
Subject: [PATCH] feat：数据中心数字增加中文字段
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 249 +++++++++++++++++++++++++++++++++----------------
1 files changed, 165 insertions(+), 84 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 549e453..34df3f5 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
@@ -4,21 +4,24 @@
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.WorkOrderMapper;
import com.ycl.platform.mapper.YwThresholdMapper;
import com.ycl.platform.service.IYwThresholdService;
-import constant.CompareConstant;
+import com.ycl.platform.service.WorkOrderService;
+import com.ycl.utils.ip.PingUtil;
import constant.YwThreadConstants;
+import enumeration.CompareType;
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.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -28,9 +31,13 @@
* @date 2024-07-19
*/
@Service
+@Slf4j
public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
@Autowired
private YwThresholdMapper ywThresholdMapper;
+
+ @Autowired
+ private WorkOrderService workOrderService;
/**
* 鏌ヨ杩愮淮闃堝��
@@ -102,15 +109,82 @@
return ywThresholdMapper.deleteYwThresholdById(id);
}
-
+ /**
+ * 鍒ゆ柇瑙嗛闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
@Override
- public void faceCheck(List list) {
+ public void videoCheck(List list) {
}
@Override
- public void videoCheck(List list) {
+ public void errorTypeCheckUY(List list) {
+ // 骞冲彴绂荤嚎鏁呴殰妫�娴�
+ if (CollectionUtils.isEmpty(list)) {
+ Boolean ping = PingUtil.ping("", 5);
+ if (! ping) {
+ }
+ }
+ // 璁惧绂荤嚎鏁呴殰妫�娴�
+
+ // 淇″彿缂哄け鏁呴殰妫�娴�
+
+ // 鐢婚潰鍋忚壊鏁呴殰妫�娴�
+
+ // 闆姳骞叉壈鏁呴殰妫�娴�
+
+ // 鏉＄汗骞叉壈鏁呴殰妫�娴�
+
+ // 鐢婚潰閬尅鏁呴殰妫�娴�
+
+ // 娓呮櫚搴﹀紓甯告娴�
+
+ // 浜害寮傚父鏁呴殰妫�娴�
+ }
+
+ /**
+ * 鍒ゆ柇浜鸿劯闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
+ @Override
+ public void faceCheck(List<FaceDeviceInspectionResult> list) {
+ Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.FACE.name());
+ //鍑嗗涓嬪彂宸ュ崟闆嗗悎
+ List<WorkOrder> distributeList = new ArrayList<>();
+ //鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
+ List<WorkOrder> workOrderList = new ArrayList<>();
+ //澶勭悊鎺ュ彛鏁版嵁
+ for (FaceDeviceInspectionResult result : list) {
+ if (result == null) {
+ log.error("浜鸿劯瀵硅薄鏁版嵁涓虹┖");
+ continue;
+ }
+ //妫�鏌ユ椂閽熷噯纭巼
+ Float clockPercent = result.getSnapClock().getClockPercent();
+ check(YwThreadConstants.Face_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ //妫�鏌ユ暟鎹強鏃剁巼
+ Float timelyPercent = result.getSnapTimely().getTimelyPercent();
+ check(YwThreadConstants.Face_TimelyPercent, timelyPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ //妫�鏌ユ寔缁棤鏁版嵁澶╂暟
+ Integer continueNoDataCount = result.getContinueNoDataCount();
+ check(YwThreadConstants.Face_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ //妫�鏌ヤ笉鍞竴鏁版嵁閲�
+ Integer nouniqueCount = result.getSnapUnique().getNouniqueCount();
+ check(YwThreadConstants.Face_NouniqueCount, nouniqueCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
+ //妫�鏌ヤ汉鑴镐綆璇勫垎鐜�
+ Float lowScorePercent = result.getSnapValidity().getLowScorePercent();
+ check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ //妫�鏌ュ缓妯″け璐ョ巼
+ Float failPercent = result.getSnapValidity().getFailPercent();
+ check(YwThreadConstants.Face_FailPercent, failPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
+ }
+ /** 娣诲姞宸ュ崟 */
+ workOrderService.innerAddWorkOrder(workOrderList);
+ workOrderService.innerAddWorkOrder(distributeList);
}
/**
@@ -120,33 +194,11 @@
*/
@Override
public void carCheck(List<VehicleDeviceInspectionResult> list) {
- QueryWrapper<YwThreshold> wrapper = new QueryWrapper<>();
- wrapper.eq("monitor_type", BusinessTypeEnum.CAR.name());
- List<YwThreshold> ywThresholds = ywThresholdMapper.selectList(wrapper);
- Map<String, YwThreshold> map = new HashMap<>();
- for (YwThreshold ywThreshold : ywThresholds) {
- String key = ywThreshold.getKey();
- map.put(key, ywThreshold);
- }
- //鏃堕挓鍑嗙‘鐜囬槇鍊�
- Float clockPercent = Float.valueOf(map.get(YwThreadConstants.Car_ClockPercent).getValue());
- Float clockPercentAuto = Float.valueOf(map.get(YwThreadConstants.Car_ClockPercent).getValueAuto());
- //鏁版嵁鍙婃椂鐜囬槇鍊�
- Float timelyPercent = Float.valueOf(map.get(YwThreadConstants.Car_TimelyPercent).getValue());
- Float timelyPercentAuto = Float.valueOf(map.get(YwThreadConstants.Car_TimelyPercent).getValueAuto());
- //鎸佺画鏃犳暟鎹ぉ鏁伴槇鍊�
- Integer continueNoDataCount = Integer.valueOf(map.get(YwThreadConstants.Car_ContinueNoDataCount).getValue());
- Integer continueNoDataCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_ContinueNoDataCount).getValueAuto());
- //涓嶅敮涓�鏁版嵁閲忛槇鍊�
- Integer nouniqueCount = Integer.valueOf(map.get(YwThreadConstants.Car_NouniqueCount).getValue());
- Integer nouniqueCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_NouniqueCount).getValueAuto());
- //鐧藉ぉ鏈瘑鍒噺闃堝��
- Integer dayNoNumberCount = Integer.valueOf(map.get(YwThreadConstants.Car_DayNoNumberCount).getValue());
- Integer dayNoNumberCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_DayNoNumberCount).getValueAuto());
- //杞﹁締鍏」灞炴�т笉瀹屾暣閲忛槇鍊�
- Integer noIntegrityCount = Integer.valueOf(map.get(YwThreadConstants.Car_NoIntegrityCount).getValue());
- Integer noIntegrityCountAuto = Integer.valueOf(map.get(YwThreadConstants.Car_NoIntegrityCount).getValueAuto());
-
+ Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.CAR.name());
+ //鍑嗗涓嬪彂宸ュ崟闆嗗悎
+ List<WorkOrder> distributeList = new ArrayList<>();
+ //鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
+ List<WorkOrder> workOrderList = new ArrayList<>();
//澶勭悊鎺ュ彛鏁版嵁
for (VehicleDeviceInspectionResult result : list) {
if (result == null) {
@@ -154,68 +206,97 @@
continue;
}
//妫�鏌ユ寔缁棤鏁版嵁澶╂暟
- Integer continueNoDataCountResult = result.getContinueNoDataCount();
- check(continueNoDataCount, continueNoDataCountAuto, result, continueNoDataCountResult, "杞﹁締鎸佺画鏃犳暟鎹ぉ鏁颁负绌�", CompareConstant.MoreThanEq);
+ Integer continueNoDataCount = result.getContinueNoDataCount();
+ check(YwThreadConstants.Car_ContinueNoDataCount, continueNoDataCount, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
//妫�鏌ユ椂閽熷噯纭巼
- Float clockPercentResult = result.getSnapClock().getClockPercent();
- check(clockPercent, clockPercentAuto, result, clockPercentResult, "杞﹁締鏃堕挓鍑嗙‘鐜囦负绌�", CompareConstant.LessThanEq);
+ Float clockPercent = result.getSnapClock().getClockPercent();
+ check(YwThreadConstants.Car_ClockPercent, clockPercent, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
//妫�鏌ユ暟鎹強鏃剁巼
Float timelyPercentResult = result.getSnapTimely().getTimelyPercent();
- check(timelyPercent, timelyPercentAuto, result, timelyPercentResult, "杞﹁締鏁版嵁鍙婃椂鐜囦负绌�", CompareConstant.LessThanEq);
+ check(YwThreadConstants.Car_TimelyPercent, timelyPercentResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ,"");
//妫�鏌ヤ笉鍞竴鏁版嵁閲�
Integer nouniqueCountResult = result.getSnapUnique().getNouniqueCount();
- check(nouniqueCount, nouniqueCountAuto, result, nouniqueCountResult, "杞﹁締涓嶅敮涓�鏁版嵁閲忎负绌�", CompareConstant.MoreThanEq);
+ check(YwThreadConstants.Car_NouniqueCount, nouniqueCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
//妫�鏌ョ櫧澶╂湭璇嗗埆閲�
Integer dayNoNumberCountResult = result.getSnapPlate().getDayNoNumberCount();
- check(dayNoNumberCount, dayNoNumberCountAuto, result, dayNoNumberCountResult, "杞﹁締鐧藉ぉ鏈瘑鍒噺涓虹┖", CompareConstant.MoreThanEq);
+ check(YwThreadConstants.Car_DayNoNumberCount, dayNoNumberCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
//杞﹁締鍏」灞炴�т笉瀹屾暣閲�
Integer noIntegrityCountResult = result.getIntegrity().getNoIntegrityCount();
- check(noIntegrityCount, noIntegrityCountAuto, result, noIntegrityCountResult, "杞﹁締鍏」灞炴�т笉瀹屾暣閲忎负绌�", CompareConstant.MoreThanEq);
+ check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result.getExternalIndexCode(), thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ,"");
}
-
+ /** 娣诲姞宸ュ崟 */
+ workOrderService.innerAddWorkOrder(workOrderList);
+ workOrderService.innerAddWorkOrder(distributeList);
}
- private void check(Integer threshold, Integer thresholdAuto, VehicleDeviceInspectionResult result, Integer thresholdResult, String message, String command) {
- if (thresholdResult != null) {
- //澶т簬绫诲瀷
- if (CompareConstant.MoreThanEq.equals(command)) {
- if (thresholdResult >= thresholdAuto) {
- //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
- } else if (thresholdResult >= threshold) {
- //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
- }
- } else if (CompareConstant.LessThanEq.equals(command)) {
- //灏忎簬绫诲瀷
- if (thresholdResult <= thresholdAuto) {
- //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
- } else if (thresholdResult <= threshold) {
- //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
- }
- }
+ /**
+ * 鎶婇槇鍊兼潯浠舵煡鍑烘潵锛岃浆鎴恗ap
+ *
+ * @param name
+ * @return
+ */
+ private Map<String, YwThreshold> getYwThresholdMap(String name) {
+ return ywThresholdMapper.selectList(
+ new QueryWrapper<YwThreshold>().eq("monitor_type", name)
+ ).stream().collect(Collectors.toMap(
+ YwThreshold::getKey,
+ Function.identity()
+ ));
+ }
+
+ /**
+ * 妫�鏌ラ槇鍊�
+ *
+ * @param key 鏌愰槇鍊兼爣璇�
+ * @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) {
+ Optional.ofNullable(value).ifPresentOrElse(
+ v -> {
+ YwThreshold ywThreshold = thresholds.get(key);
+ //杞崲绫诲瀷
+ T thresholdValue = parseThreshold(ywThreshold.getValueAuto(), value.getClass());
+ T thresholdAutoValue = parseThreshold(ywThreshold.getValue(), value.getClass());
+ //姣旇緝澶у皬锛屽姞鍏ュ埌瀵瑰簲寰呭鐞嗛泦鍚�
+ if (compareType.compare(v, thresholdAutoValue)) {
+ //鑷姩涓嬪彂宸ュ崟
+ WorkOrder workOrder = new WorkOrder();
+ workOrder.setSerialNumber(serialNumber);
+ workOrder.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
+ workOrder.setErrorType(errorType);
+ workOrderList.add(workOrder);
+ } else if (compareType.compare(v, thresholdValue)) {
+ //杩涘叆宸ュ崟浠ｄ笅鍙�
+ WorkOrder workOrder = new WorkOrder();
+ workOrder.setSerialNumber(serialNumber);
+ workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ workOrder.setErrorType(errorType);
+ distributeList.add(workOrder);
+ }
+ },
+ () -> log.error("{} 涓虹┖: {}", thresholds.get(key).getName(), serialNumber)
+ );
+ }
+
+ private <T extends Comparable<T>> T parseThreshold(String thresholdStr, Class<?> type) {
+ if (Integer.class.equals(type)) {
+ return (T) Integer.valueOf(thresholdStr);
+ } else if (Float.class.equals(type)) {
+ return (T) Float.valueOf(thresholdStr);
+ } else if (Double.class.equals(type)) {
+ return (T) Double.valueOf(thresholdStr);
+ } else if (Long.class.equals(type)) {
+ return (T) Long.valueOf(thresholdStr);
} else {
- log.error(message + result);
+ throw new IllegalArgumentException("涓嶆敮鎸佽浆鎹㈢被鍨�" + type);
}
}
- private void check(Float threshold, Float thresholdAuto, VehicleDeviceInspectionResult result, Float thresholdResult, String message, String command) {
- if (thresholdResult != null) {
- //澶т簬绫诲瀷
- if (CompareConstant.MoreThanEq.equals(command)) {
- if (thresholdResult >= thresholdAuto) {
- //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
- } else if (thresholdResult >= threshold) {
- //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
- }
- } else if (CompareConstant.LessThanEq.equals(command)) {
- //灏忎簬绫诲瀷
- if (thresholdResult <= thresholdAuto) {
- //TODO锛氳嚜鍔ㄤ笅鍙戝伐鍗�
- } else if (thresholdResult <= threshold) {
- //TODO锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
- }
- }
- } else {
- log.error(message + result);
- }
- }
}
--
Gitblit v1.8.0