From 77ce942a696de881cc703745b8b1d112ddb70fa5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 22 七月 2024 18:45:44 +0800
Subject: [PATCH] 车辆数据阈值检查接口
---
ycl-common/src/main/java/constant/CompareConstant.java | 13 +++
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 144 ++++++++++++++++++++++++++++++++---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 7 +
ycl-server/src/main/java/com/ycl/platform/mapper/YwThresholdMapper.java | 4 -
ycl-server/src/main/java/com/ycl/platform/service/IYwThresholdService.java | 16 ++++
ycl-common/src/main/java/constant/YwThreadConstants.java | 32 ++++++++
6 files changed, 195 insertions(+), 21 deletions(-)
diff --git a/ycl-common/src/main/java/constant/CompareConstant.java b/ycl-common/src/main/java/constant/CompareConstant.java
new file mode 100644
index 0000000..9a82af8
--- /dev/null
+++ b/ycl-common/src/main/java/constant/CompareConstant.java
@@ -0,0 +1,13 @@
+package constant;
+//姣旇緝绫诲瀷
+public class CompareConstant {
+ /**
+ * 澶т簬绛変簬
+ */
+ public static final String MoreThanEq = "moreThanEq";
+
+ /**
+ * 灏忎簬绛変簬
+ */
+ public static final String LessThanEq = "lessThanEq";
+}
diff --git a/ycl-common/src/main/java/constant/YwThreadConstants.java b/ycl-common/src/main/java/constant/YwThreadConstants.java
new file mode 100644
index 0000000..59beead
--- /dev/null
+++ b/ycl-common/src/main/java/constant/YwThreadConstants.java
@@ -0,0 +1,32 @@
+package constant;
+
+/**
+ * 闃堝�煎父閲�
+ */
+public class YwThreadConstants {
+
+ public static final String Car_ClockPercent = "鏃堕挓鍑嗙‘鐜�";
+ public static final String Car_TimelyPercent = "鏁版嵁鍙婃椂鐜�";
+ public static final String Car_DayNoNumberCount = "杞﹁締鏈瘑鍒噺";
+ public static final String Car_NouniqueCount = "涓嶅敮涓�鏁版嵁閲�";
+ public static final String Car_NoIntegrityCount = "杞﹁締鍏」灞炴�т笉瀹屾暣閲�";
+ public static final String Car_ContinueNoDataCount = "鎸佺画鏃犳暟鎹ぉ鏁�";
+
+ public static final String Face_ClockPercent = "鏃堕挓鍑嗙‘鐜�";
+ public static final String Face_TimelyPercent = "鏁版嵁鍙婃椂鐜�";
+ public static final String Face_NouniqueCount = "涓嶅敮涓�鏁版嵁閲�";
+ public static final String Face_FailPercent = "寤烘ā澶辫触鐜�";
+ public static final String Face_LowScorePercent = "骞冲潎浜鸿劯浣庡钩鍒嗙巼";
+ public static final String Face_ContinueNoDataCount = "鎸佺画鏃犳暟鎹ぉ鏁�";
+
+ public static final String Video_Blur = "妯＄硦鍒嗗��";
+ public static final String Video_Color = "棰滆壊鍒嗗��";
+ public static final String Video_Light = "浜害鍒嗗��";
+ public static final String Video_Shade = "閬尅鍒嗗��";
+ public static final String Video_Shake = "鎶栧姩鍒嗗��";
+ public static final String Video_Snow = "闆姳鍒嗗��";
+ public static final String Video_stripe = "鏉＄汗鍒嗗��";
+ public static final String Video_signal = "淇″彿鍒嗗��";
+ public static final String Video_diffTime = "鏍囨敞鏃堕棿宸�";
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/YwThresholdMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/YwThresholdMapper.java
index 38c8cf1..ecfcfda 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/YwThresholdMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/YwThresholdMapper.java
@@ -61,8 +61,4 @@
*/
public int deleteYwThresholdByIds(Long[] ids);
- /**
- * 鏍规嵁璁惧绫诲瀷鑾峰彇杩愮淮闃堝��
- */
- public List<YwThreshold> selectByType(String type);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/IYwThresholdService.java b/ycl-server/src/main/java/com/ycl/platform/service/IYwThresholdService.java
index 58b5ad0..d2eaaa2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/IYwThresholdService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/IYwThresholdService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.platform.domain.entity.YwThreshold;
+import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
import java.util.List;
import java.util.Map;
@@ -61,4 +62,19 @@
* @return 缁撴灉
*/
public int deleteYwThresholdById(Long id);
+
+ /**
+ * 鍒ゆ柇杞﹁締闃堝�兼潯浠�
+ */
+ public void carCheck(List<VehicleDeviceInspectionResult> list);
+
+ /**
+ * 鍒ゆ柇浜鸿劯闃堝�兼潯浠�
+ */
+ public void faceCheck(List list);
+
+ /**
+ * 鍒ゆ柇瑙嗛闃堝�兼潯浠�
+ */
+ public void videoCheck(List list);
}
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..f3752af 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,16 +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.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 constant.YwThreadConstants;
+import enumeration.general.BusinessTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import utils.DateUtils;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -22,8 +28,7 @@
* @date 2024-07-19
*/
@Service
-public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService
-{
+public class YwThresholdServiceImpl extends ServiceImpl<YwThresholdMapper, YwThreshold> implements IYwThresholdService {
@Autowired
private YwThresholdMapper ywThresholdMapper;
@@ -34,8 +39,7 @@
* @return 杩愮淮闃堝��
*/
@Override
- public YwThreshold selectYwThresholdById(Long id)
- {
+ public YwThreshold selectYwThresholdById(Long id) {
return ywThresholdMapper.selectYwThresholdById(id);
}
@@ -46,8 +50,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 +63,7 @@
* @return 缁撴灉
*/
@Override
- public int insertYwThreshold(YwThreshold ywThreshold)
- {
+ public int insertYwThreshold(YwThreshold ywThreshold) {
ywThreshold.setCreateTime(DateUtils.getNowDate());
return ywThresholdMapper.insertYwThreshold(ywThreshold);
}
@@ -73,8 +75,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 +87,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdByIds(Long[] ids)
- {
+ public int deleteYwThresholdByIds(Long[] ids) {
return ywThresholdMapper.deleteYwThresholdByIds(ids);
}
@@ -98,8 +98,124 @@
* @return 缁撴灉
*/
@Override
- public int deleteYwThresholdById(Long id)
- {
+ public int deleteYwThresholdById(Long id) {
return ywThresholdMapper.deleteYwThresholdById(id);
}
+
+
+ @Override
+ public void faceCheck(List list) {
+
+ }
+
+ @Override
+ public void videoCheck(List list) {
+
+ }
+
+ /**
+ * 鍒ゆ柇杞﹁締闃堝�兼槸鍚︽弧瓒充笅鍙戞潯浠�
+ *
+ * @param list
+ */
+ @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 name = ywThreshold.getName();
+ map.put(name, 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());
+
+ //澶勭悊鎺ュ彛鏁版嵁
+ for (VehicleDeviceInspectionResult result : list) {
+ if (result == null) {
+ log.error("杞﹁締瀵硅薄鏁版嵁涓虹┖");
+ continue;
+ }
+ //妫�鏌ユ寔缁棤鏁版嵁澶╂暟
+ Integer continueNoDataCountResult = result.getContinueNoDataCount();
+ check(continueNoDataCount, continueNoDataCountAuto, result, continueNoDataCountResult, "杞﹁締鎸佺画鏃犳暟鎹ぉ鏁颁负绌�", CompareConstant.MoreThanEq);
+ //妫�鏌ユ椂閽熷噯纭巼
+ Float clockPercentResult = result.getSnapClock().getClockPercent();
+ check(clockPercent, clockPercentAuto, result, clockPercentResult, "杞﹁締鏃堕挓鍑嗙‘鐜囦负绌�", CompareConstant.LessThanEq);
+ //妫�鏌ユ暟鎹強鏃剁巼
+ Float timelyPercentResult = result.getSnapTimely().getTimelyPercent();
+ check(timelyPercent, timelyPercentAuto, result, timelyPercentResult, "杞﹁締鏁版嵁鍙婃椂鐜囦负绌�", CompareConstant.LessThanEq);
+ //妫�鏌ヤ笉鍞竴鏁版嵁閲�
+ Integer nouniqueCountResult = result.getSnapUnique().getNouniqueCount();
+ check(nouniqueCount, nouniqueCountAuto, result, nouniqueCountResult, "杞﹁締涓嶅敮涓�鏁版嵁閲忎负绌�", CompareConstant.MoreThanEq);
+ //妫�鏌ョ櫧澶╂湭璇嗗埆閲�
+ Integer dayNoNumberCountResult = result.getSnapPlate().getDayNoNumberCount();
+ check(dayNoNumberCount, dayNoNumberCountAuto, result, dayNoNumberCountResult, "杞﹁締鐧藉ぉ鏈瘑鍒噺涓虹┖", CompareConstant.MoreThanEq);
+ //杞﹁締鍏」灞炴�т笉瀹屾暣閲�
+ Integer noIntegrityCountResult = result.getIntegrity().getNoIntegrityCount();
+ check(noIntegrityCount, noIntegrityCountAuto, result, noIntegrityCountResult, "杞﹁締鍏」灞炴�т笉瀹屾暣閲忎负绌�", CompareConstant.MoreThanEq);
+ }
+
+ }
+
+ 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锛氳繘鍏ヤ笅鍙戝伐鍗曢〉闈�
+ }
+ }
+ } else {
+ log.error(message + result);
+ }
+ }
+
+ 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);
+ }
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index e508811..d4bf4be 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -7,6 +7,7 @@
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.web.HKClient;
import enumeration.BusinessType;
import enumeration.general.BusinessTypeEnum;
@@ -30,7 +31,7 @@
@Autowired
private HKClient hkClient;
@Autowired
- private YwThresholdMapper thresholdMapper;
+ private IYwThresholdService ywThresholdService;
private final static Integer pageNo = 1;
private final static Integer pageSize = 5000;
@@ -53,10 +54,10 @@
if (CollectionUtils.isEmpty(list)) {
throw new RuntimeException("杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
}
- //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
- List<YwThreshold> ywThresholds = thresholdMapper.selectByType(BusinessTypeEnum.CAR.name());
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(list);
+ //鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
+ ywThresholdService.carCheck(list);
} else {
log.error("鍚屾杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
}
--
Gitblit v1.8.0