From f5e1051a7e6d3ffccc815a631d8be372d772c58f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 23 七月 2024 11:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml | 17 +-
ycl-common/src/main/java/constant/CompareConstant.java | 13 ++
ycl-server/src/main/java/com/ycl/task/HKTask.java | 12 +
ycl-server/src/main/java/com/ycl/platform/mapper/YwThresholdMapper.java | 4
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 2
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 144 +++++++++++++++++++++--
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java | 2
ycl-server/src/main/java/com/ycl/web/UYClient.java | 7
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java | 5
ycl-server/src/main/java/com/ycl/platform/service/IYwThresholdService.java | 16 ++
ycl-server/src/main/java/com/ycl/task/UYTask.java | 59 +++++++++
ycl-common/src/main/java/constant/YwThreadConstants.java | 52 ++++++++
17 files changed, 302 insertions(+), 41 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..c32dba7
--- /dev/null
+++ b/ycl-common/src/main/java/constant/YwThreadConstants.java
@@ -0,0 +1,52 @@
+package constant;
+
+/**
+ * 闃堝�煎父閲�
+ */
+public class YwThreadConstants {
+ //鏃堕挓鍑嗙‘鐜�
+ public static final String Car_ClockPercent = "Car_ClockPercent";
+ //鏁版嵁鍙婃椂鐜�
+ public static final String Car_TimelyPercent = "Car_TimelyPercent";
+ //鐧藉ぉ杞﹁締鏈瘑鍒噺
+ public static final String Car_DayNoNumberCount = "Car_DayNoNumberCount";
+ //涓嶅敮涓�鏁版嵁閲�
+ public static final String Car_NouniqueCount = "Car_NouniqueCount";
+ //鍏」鏁版嵁涓嶅畬鏁撮噺
+ public static final String Car_NoIntegrityCount = "Car_NoIntegrityCount";
+ //鎸佺画鏃犳暟鎹ぉ鏁�
+ public static final String Car_ContinueNoDataCount = "Car_ContinueNoDataCount";
+
+ //鏃堕挓鍑嗙‘鐜�
+ public static final String Face_ClockPercent = "Face_ClockPercent";
+ //鏁版嵁鍙婃椂鐜�
+ public static final String Face_TimelyPercent = "Face_TimelyPercent";
+ //涓嶅敮涓�鏁版嵁閲�
+ public static final String Face_NouniqueCount = "Face_NouniqueCount";
+ //寤烘ā澶辫触鐜�
+ public static final String Face_FailPercent = "Face_FailPercent";
+ //骞冲潎浜鸿劯浣庡钩鍒嗙巼
+ public static final String Face_LowScorePercent = "Face_LowScorePercent";
+ //鎸佺画鏃犳暟鎹ぉ鏁�
+ public static final String Face_ContinueNoDataCount = "Face_ContinueNoDataCount";
+
+ //妯＄硦鍒嗗��
+ public static final String Video_Blur = "Video_Blur";
+ //棰滆壊鍒嗗��
+ public static final String Video_Color = "Video_Color";
+ //浜害鍒嗗��
+ public static final String Video_Light = "Video_Light";
+ //閬尅鍒嗗��
+ public static final String Video_Shade = "Video_Shade";
+ //鎶栧姩鍒嗗��
+ public static final String Video_Shake = "Video_Shake";
+ //闆姳鍒嗗��
+ public static final String Video_Snow = "Video_Snow";
+ //鏉＄汗鍒嗗��
+ public static final String Video_Stripe = "Video_Stripe";
+ //淇″彿鍒嗗��
+ public static final String Video_Signal = "Video_Signal";
+ //鏍囨敞鏃堕棿宸�
+ public static final String Video_DiffTime = "Video_DiffTime";
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
index ae804d7..e91c0d9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java
@@ -39,6 +39,11 @@
@TableField("count_type")
private String countType;
+ /** 閿�煎搴擸wThreadConstants */
+ @Excel(name = "閿��")
+ @TableField("`key`")
+ private String key;
+
/** 闃堝�煎悕 */
@Excel(name = "闃堝�煎悕")
@TableField("name")
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/CameraParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
similarity index 89%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/CameraParam.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
index 176eec5..0a74a9d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/CameraParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.param.YY;
+package com.ycl.platform.domain.param.UY;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/OnlineParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
similarity index 91%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/OnlineParam.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
index 5ab8659..110dc3c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/OnlineParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OnlineParam.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.param.YY;
+package com.ycl.platform.domain.param.UY;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/RecordMetaDSumParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
similarity index 96%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/RecordMetaDSumParam.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
index b842cba..83ea4e5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/YY/RecordMetaDSumParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.param.YY;
+package com.ycl.platform.domain.param.UY;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/CameraResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
similarity index 98%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/CameraResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
index 059dd62..93e5fda 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/CameraResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
import lombok.Data;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
similarity index 96%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OnlineResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
index 1868a9b..8e6f1b1 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OnlineResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
import lombok.Data;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OsdMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
similarity index 97%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OsdMonitorResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
index 078b9d4..8ac3736 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/OsdMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
import lombok.Data;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/RecordMetaDSumResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
similarity index 96%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/RecordMetaDSumResult.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
index 6422958..94819a5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/YY/RecordMetaDSumResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -1,4 +1,4 @@
-package com.ycl.platform.domain.result.YY;
+package com.ycl.platform.domain.result.UY;
import lombok.Data;
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..549e453 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 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());
+
+ //澶勭悊鎺ュ彛鏁版嵁
+ 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..5220041 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,11 @@
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);
}
@@ -79,10 +81,10 @@
if (CollectionUtils.isEmpty(list)) {
throw new RuntimeException("浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁涓虹┖");
}
- //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
-
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insert(list);
+ //TODO:鍚屾鐨勬暟鎹彲鑳介渶瑕佸伐鍗曢槇鍊肩瓑澶勭悊
+
} else {
log.error("鍚屾浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉澶辫触", jsonObject);
}
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
new file mode 100644
index 0000000..e0c9c37
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -0,0 +1,59 @@
+package com.ycl.task;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.ycl.platform.domain.param.HK.FaceDeviceInspectionParam;
+import com.ycl.platform.domain.param.HK.VehicleDeviceInspectionParam;
+import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult;
+import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
+import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.web.HKClient;
+import com.ycl.web.UYClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+
+@Slf4j
+@Component("UYTask")
+public class UYTask {
+
+ @Autowired
+ private MongoTemplate mongoTemplate;
+ @Autowired
+ private UYClient uyClient;
+ @Autowired
+ private IYwThresholdService ywThresholdService;
+
+ private final static Integer pageNo = 1;
+ private final static Integer pageSize = 5000;
+ //鎴愬姛鐘舵�佺爜
+ private final static String successCode = "0";
+
+ //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
+ public void VehicleDeviceInspectionTask() {
+ log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+
+ log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ }
+
+
+ public void FaceDeviceInspectionTask() {
+ log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+
+ log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
+ }
+
+
+ private String getToday() {
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String today = sdf.format(date);
+ return today;
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/web/UYClient.java b/ycl-server/src/main/java/com/ycl/web/UYClient.java
index e66f4ef..8757669 100644
--- a/ycl-server/src/main/java/com/ycl/web/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/web/UYClient.java
@@ -1,11 +1,10 @@
package com.ycl.web;
import com.alibaba.fastjson2.JSONObject;
-import com.ycl.config.HKFeignConfig;
import com.ycl.config.YYFeignConfig;
-import com.ycl.platform.domain.param.YY.CameraParam;
-import com.ycl.platform.domain.param.YY.OnlineParam;
-import com.ycl.platform.domain.param.YY.RecordMetaDSumParam;
+import com.ycl.platform.domain.param.UY.CameraParam;
+import com.ycl.platform.domain.param.UY.OnlineParam;
+import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
index e969c66..0e50e52 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.YwThresholdMapper">
-
+
<resultMap type="YwThreshold" id="YwThresholdResult">
<result property="id" column="id" />
<result property="monitorType" column="monitor_type" />
@@ -18,12 +18,12 @@
</resultMap>
<sql id="selectYwThresholdVo">
- select id, monitor_type, count_type, name, value, value_auto, create_time, update_time, description, deleted from t_yw_threshold
+ select id, monitor_type, count_type, `key` , name, value, value_auto, create_time, update_time, description, deleted from t_yw_threshold
</sql>
<select id="selectYwThresholdList" parameterType="YwThreshold" resultMap="YwThresholdResult">
<include refid="selectYwThresholdVo"/>
- <where>
+ <where>
<if test="monitorType != null and monitorType != ''"> and monitor_type = #{monitorType}</if>
<if test="countType != null and countType != ''"> and count_type = #{countType}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -33,17 +33,18 @@
<if test="deleted != null and deleted != ''"> and deleted = #{deleted}</if>
</where>
</select>
-
+
<select id="selectYwThresholdById" parameterType="Long" resultMap="YwThresholdResult">
<include refid="selectYwThresholdVo"/>
where id = #{id}
</select>
-
+
<insert id="insertYwThreshold" parameterType="YwThreshold" useGeneratedKeys="true" keyProperty="id">
insert into t_yw_threshold
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="monitorType != null and monitorType != ''">monitor_type,</if>
<if test="countType != null">count_type,</if>
+ <if test="key != null">`key`,</if>
<if test="name != null">name,</if>
<if test="value != null">value,</if>
<if test="valueAuto != null">value_auto,</if>
@@ -55,6 +56,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="monitorType != null and monitorType != ''">#{monitorType},</if>
<if test="countType != null">#{countType},</if>
+ <if test="key != null">#{key},</if>
<if test="name != null">#{name},</if>
<if test="value != null">#{value},</if>
<if test="valueAuto != null">#{valueAuto},</if>
@@ -70,6 +72,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="monitorType != null and monitorType != ''">monitor_type = #{monitorType},</if>
<if test="countType != null">count_type = #{countType},</if>
+ <if test="key != null">`key` = #{key},</if>
<if test="name != null">name = #{name},</if>
<if test="value != null">value = #{value},</if>
<if test="valueAuto != null">value_auto = #{valueAuto},</if>
@@ -86,9 +89,9 @@
</delete>
<delete id="deleteYwThresholdByIds" parameterType="String">
- delete from t_yw_threshold where id in
+ delete from t_yw_threshold where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.8.0