From 009e3e6fe18e3229ef1a6b2a39c9de57dd9d34bc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 31 七月 2024 15:58:38 +0800
Subject: [PATCH] 数据中心响应类调整
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 261 ++++++++++++++++++++++++++++++----------------------
1 files changed, 150 insertions(+), 111 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 6eca6d8..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,36 +1,35 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.dto.CarDTO;
-import com.ycl.platform.domain.dto.FaceDTO;
-import com.ycl.platform.domain.dto.VideoDTO;
import com.ycl.platform.domain.entity.YwThreshold;
-import com.ycl.platform.domain.form.CarThresholdForm;
-import com.ycl.platform.domain.form.FaceThresholdForm;
-import com.ycl.platform.domain.form.VideoThresholdForm;
+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.utils.DateUtils;
+import constant.YwThreadConstants;
+import enumeration.CompareType;
import enumeration.general.BusinessTypeEnum;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import utils.DateUtils;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 杩愮淮闃堝�糞ervice涓氬姟灞傚鐞�
*
* @author gonghl
- * @date 2024-03-25
+ * @date 2024-07-19
*/
@Service
-@RequiredArgsConstructor
+@Slf4j
public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
-
- private final YwThresholdMapper ywThresholdMapper;
+ @Autowired
+ private YwThresholdMapper ywThresholdMapper;
/**
* 鏌ヨ杩愮淮闃堝��
@@ -39,7 +38,7 @@
* @return 杩愮淮闃堝��
*/
@Override
- public YwThreshold selectYwThresholdById(Integer id) {
+ public YwThreshold selectYwThresholdById(Long id) {
return ywThresholdMapper.selectYwThresholdById(id);
}
@@ -50,8 +49,10 @@
* @return 杩愮淮闃堝��
*/
@Override
- public List<YwThreshold> selectYwThresholdList(YwThreshold ywThreshold) {
- return ywThresholdMapper.selectYwThresholdList(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;
}
/**
@@ -69,13 +70,13 @@
/**
* 淇敼杩愮淮闃堝��
*
- * @param ywThreshold 杩愮淮闃堝��
+ * @param list 杩愮淮闃堝��
* @return 缁撴灉
*/
@Override
- public int updateYwThreshold(YwThreshold ywThreshold) {
- ywThreshold.setUpdateTime(DateUtils.getNowDate());
- return ywThresholdMapper.updateYwThreshold(ywThreshold);
+ public Boolean updateYwThreshold(List<YwThreshold> list) {
+ list.forEach(item -> item.setCreateTime(new Date()));
+ return updateBatchById(list);
}
/**
@@ -85,7 +86,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdByIds(Integer[] ids) {
+ public int deleteYwThresholdByIds(Long[] ids) {
return ywThresholdMapper.deleteYwThresholdByIds(ids);
}
@@ -96,105 +97,143 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdById(Integer id) {
+ public int deleteYwThresholdById(Long id) {
return ywThresholdMapper.deleteYwThresholdById(id);
}
+ /**
+ * 鍒ゆ柇瑙嗛闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
@Override
- public int editFace(FaceThresholdForm form) {
- YwThreshold ywThreshold = baseMapper.selectById(form.getId());
- if (Objects.isNull(ywThreshold)) {
- throw new RuntimeException("鏁版嵁涓嶅瓨鍦�");
+ 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);
}
- BeanUtils.copyProperties(form, ywThreshold);
-// ywThreshold.setIndicator(JSON.toJSONString(form));
- return baseMapper.updateById(ywThreshold);
+ //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
}
+ /**
+ * 鍒ゆ柇杞﹁締闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
@Override
- public int editCar(CarThresholdForm form) {
- YwThreshold ywThreshold = baseMapper.selectById(form.getId());
- if (Objects.isNull(ywThreshold)) {
- throw new RuntimeException("鏁版嵁涓嶅瓨鍦�");
+ 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);
}
- BeanUtils.copyProperties(form, ywThreshold);
-// ywThreshold.setIndicator(JSON.toJSONString(form));
- return baseMapper.updateById(ywThreshold);
+ //TODO锛氬緟澶勭悊闆嗗悎娣诲姞宸ュ崟
}
- @Override
- public int editVideo(VideoThresholdForm form) {
- YwThreshold ywThreshold = baseMapper.selectById(form.getId());
- if (Objects.isNull(ywThreshold)) {
- throw new RuntimeException("鏁版嵁涓嶅瓨鍦�");
+ //灏佽闃堝�间负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);
}
- BeanUtils.copyProperties(form, ywThreshold);
-// ywThreshold.setIndicator(JSON.toJSONString(form));
- return baseMapper.updateById(ywThreshold);
}
- @Override
- public Boolean checkFace(List<FaceDTO> faceList) {
- YwThreshold faceEntity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.FACE)
- .one();
- if (Objects.isNull(faceEntity)) {
- throw new RuntimeException("璇烽厤缃汉鑴哥殑宸ュ崟闃堝��");
- }
- // todo 閬嶅巻鏉′欢锛岀敓鎴愬伐鍗�
- return Boolean.FALSE;
- }
-
- @Override
- public Boolean checkCar(List<CarDTO> faceList) {
- YwThreshold carEntity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.CAR)
- .one();
- if (Objects.isNull(carEntity)) {
- throw new RuntimeException("璇烽厤缃溅杈嗙殑宸ュ崟闃堝��");
- }
- // todo 閬嶅巻鏉′欢锛岀敓鎴愬伐鍗�
- return Boolean.FALSE;
- }
-
- @Override
- public Boolean checkVideo(List<VideoDTO> faceList) {
- YwThreshold videoEntity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.VIDEO)
- .one();
- if (Objects.isNull(videoEntity)) {
- throw new RuntimeException("璇烽厤缃棰戠殑宸ュ崟闃堝��");
- }
- // todo 閬嶅巻鏉′欢锛岀敓鎴愬伐鍗�
- return Boolean.FALSE;
- }
-
- @Override
- public FaceThresholdForm getFace(Integer id) {
- return null;
- }
-
- @Override
- public CarThresholdForm getCar(Integer id) {
- return null;
- }
-
- @Override
- public VideoThresholdForm getVideo(Integer id) {
- YwThreshold result = new LambdaQueryChainWrapper<>(baseMapper)
- .select(YwThreshold::getImageQuality,
- YwThreshold::getId,
- YwThreshold::getMonitorType,
- YwThreshold::getImageQualityAuto,
- YwThreshold::getVideoQuality,
- YwThreshold::getVideoQualityAuto,
- YwThreshold::getAnnotationAccuracy,
- YwThreshold::getAnnotationAccuracyAuto)
- .eq(YwThreshold::getId, id)
- .eq(YwThreshold::getMonitorType, BusinessTypeEnum.VIDEO)
- .one();
- VideoThresholdForm form = new VideoThresholdForm();
- BeanUtils.copyProperties(result, form);
- return form;
- }
}
--
Gitblit v1.8.0