From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 153 insertions(+), 19 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 273be68..f7e87d5 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
@@ -1,18 +1,22 @@
package com.ycl.platform.service.impl;
+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.mapper.WorkOrderMapper;
+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 constant.YwThreadConstants;
+import enumeration.CompareType;
+import enumeration.general.BusinessTypeEnum;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -22,8 +26,8 @@
* @date 2024-07-19
*/
@Service
-public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService
-{
+@Slf4j
+public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
@Autowired
private YwThresholdMapper ywThresholdMapper;
@@ -34,8 +38,7 @@
* @return 杩愮淮闃堝��
*/
@Override
- public YwThreshold selectYwThresholdById(Long id)
- {
+ public YwThreshold selectYwThresholdById(Long id) {
return ywThresholdMapper.selectYwThresholdById(id);
}
@@ -46,8 +49,7 @@
* @return 杩愮淮闃堝��
*/
@Override
- public Map<String, List<YwThreshold>> selectYwThresholdList(YwThreshold ywThreshold)
- {
+ public Map<String, List<YwThreshold>> selectYwThresholdList(YwThreshold ywThreshold) {
List<YwThreshold> ywThresholds = ywThresholdMapper.selectYwThresholdList(ywThreshold);
Map<String, List<YwThreshold>> map = ywThresholds.stream().collect(Collectors.groupingBy(YwThreshold::getMonitorType));
return map;
@@ -60,8 +62,7 @@
* @return 缁撴灉
*/
@Override
- public int insertYwThreshold(YwThreshold ywThreshold)
- {
+ public int insertYwThreshold(YwThreshold ywThreshold) {
ywThreshold.setCreateTime(DateUtils.getNowDate());
return ywThresholdMapper.insertYwThreshold(ywThreshold);
}
@@ -73,8 +74,7 @@
* @return 缁撴灉
*/
@Override
- public Boolean updateYwThreshold(List<YwThreshold> list)
- {
+ public Boolean updateYwThreshold(List<YwThreshold> list) {
list.forEach(item -> item.setCreateTime(new Date()));
return updateBatchById(list);
}
@@ -86,8 +86,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdByIds(Long[] ids)
- {
+ public int deleteYwThresholdByIds(Long[] ids) {
return ywThresholdMapper.deleteYwThresholdByIds(ids);
}
@@ -98,8 +97,143 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdById(Long id)
- {
+ public int deleteYwThresholdById(Long id) {
return ywThresholdMapper.deleteYwThresholdById(id);
}
+
+ /**
+ * 鍒ゆ柇瑙嗛闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
+ @Override
+ public void videoCheck(List list) {
+
+ }
+
+ /**
+ * 鍒ゆ柇浜鸿劯闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
+ @Override
+ public void faceCheck(List<FaceDeviceInspectionResult> list) {
+ Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.FACE.name());
+ //鍑嗗涓嬪彂宸ュ崟闆嗗悎
+ List<FaceDeviceInspectionResult> distributeList = new ArrayList<>();
+ //鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
+ List<FaceDeviceInspectionResult> workOrderList = new ArrayList<>();
+ //澶勭悊鎺ュ彛鏁版嵁
+ for (FaceDeviceInspectionResult result : list) {
+ if (result == null) {
+ log.error("浜鸿劯瀵硅薄鏁版嵁涓虹┖");
+ continue;
+ }
+ //妫�鏌ユ椂閽熷噯纭巼
+ Float clockPercent = result.getSnapClock().getClockPercent();
+ check(YwThreadConstants.Face_ClockPercent, clockPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ //妫�鏌ユ暟鎹強鏃剁巼
+ Float timelyPercent = result.getSnapTimely().getTimelyPercent();
+ check(YwThreadConstants.Face_TimelyPercent, timelyPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ //妫�鏌ユ寔缁棤鏁版嵁澶╂暟
+ Integer continueNoDataCount = result.getContinueNoDataCount();
+ check(YwThreadConstants.Face_ContinueNoDataCount, continueNoDataCount, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+ //妫�鏌ヤ笉鍞竴鏁版嵁閲�
+ Integer nouniqueCount = result.getSnapUnique().getNouniqueCount();
+ check(YwThreadConstants.Face_NouniqueCount, nouniqueCount, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+ //妫�鏌ヤ汉鑴镐綆璇勫垎鐜�
+ Float lowScorePercent = result.getSnapValidity().getLowScorePercent();
+ check(YwThreadConstants.Face_LowScorePercent, lowScorePercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ //妫�鏌ュ缓妯″け璐ョ巼
+ Float failPercent = result.getSnapValidity().getFailPercent();
+ check(YwThreadConstants.Face_FailPercent, failPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ }
+ //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
+ }
+
+ /**
+ * 鍒ゆ柇杞﹁締闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
+ @Override
+ public void carCheck(List<VehicleDeviceInspectionResult> list) {
+ Map<String, YwThreshold> thresholdMap = getYwThresholdMap(BusinessTypeEnum.CAR.name());
+ //鍑嗗涓嬪彂宸ュ崟闆嗗悎
+ List<VehicleDeviceInspectionResult> distributeList = new ArrayList<>();
+ //鍑嗗鑷姩鐢熸垚宸ュ崟闆嗗悎
+ List<VehicleDeviceInspectionResult> workOrderList = new ArrayList<>();
+ //澶勭悊鎺ュ彛鏁版嵁
+ for (VehicleDeviceInspectionResult result : list) {
+ if (result == null) {
+ log.error("杞﹁締瀵硅薄鏁版嵁涓虹┖");
+ continue;
+ }
+ //妫�鏌ユ寔缁棤鏁版嵁澶╂暟
+ Integer continueNoDataCount = result.getContinueNoDataCount();
+ check(YwThreadConstants.Car_ContinueNoDataCount, continueNoDataCount, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+ //妫�鏌ユ椂閽熷噯纭巼
+ Float clockPercent = result.getSnapClock().getClockPercent();
+ check(YwThreadConstants.Car_ClockPercent, clockPercent, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ //妫�鏌ユ暟鎹強鏃剁巼
+ Float timelyPercentResult = result.getSnapTimely().getTimelyPercent();
+ check(YwThreadConstants.Car_TimelyPercent, timelyPercentResult, result, thresholdMap, distributeList, workOrderList, CompareType.LESS_THAN_EQ);
+ //妫�鏌ヤ笉鍞竴鏁版嵁閲�
+ Integer nouniqueCountResult = result.getSnapUnique().getNouniqueCount();
+ check(YwThreadConstants.Car_NouniqueCount, nouniqueCountResult, result, thresholdMap, distributeList, workOrderList, CompareType.MORE_THAN_EQ);
+ //妫�鏌ョ櫧澶╂湭璇嗗埆閲�
+ 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);
+ }
+ //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
+ }
+
+ //灏佽闃堝�间负map
+ 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()
+ ));
+ }
+
+ //妫�鏌ラ槇鍊�
+ private <T extends Comparable<T>> void check(String key, T value, Object result, Map<String, YwThreshold> thresholds, List distributeList, List workOrderList, CompareType compareType) {
+ 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)) {
+ //鑷姩涓嬪彂宸ュ崟
+ workOrderList.add(result);
+ } else if (compareType.compare(v, thresholdValue)) {
+ //杩涘叆宸ュ崟浠ｄ笅鍙�
+ distributeList.add(result);
+ }
+ },
+ () -> log.error("{} 涓虹┖: {}", thresholds.get(key).getName(), result)
+ );
+ }
+
+ 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 {
+ throw new IllegalArgumentException("涓嶆敮鎸佽浆鎹㈢被鍨�" + type);
+ }
+ }
+
}
--
Gitblit v1.8.0