From 4ac87bb3275667c02bc60012ebb9fc1eeab6da5b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 17:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
index 78cb310..12f0be7 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -33,14 +33,13 @@
@Autowired
private CheckScoreMapper scoreMapper;
@Autowired
- private MongoTemplate mongoTemplate;
- @Autowired
private ICheckIndexVideoService videoService;
@Autowired
private ICheckIndexFaceService faceService;
@Autowired
private ICheckIndexCarService carService;
+ //TODO锛氱粺涓�浠诲姟鏃堕棿
public void executeTemplate(Integer templateId) {
CheckTemplate checkTemplate = templateMapper.selectCheckTemplateById(templateId);
if (checkTemplate != null) {
@@ -66,7 +65,7 @@
//鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�瑙嗛鏁版嵁
List<CheckIndexVideo> checkIndexVideos = videoService.selectCheckIndexVideoList(checkIndexVideo);
for (CheckIndexVideo indexVideo : checkIndexVideos) {
- addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexVideo,CheckConstants.Rule_Category_Video);
+ addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexVideo, CheckConstants.Rule_Category_Video);
}
} else if (CheckConstants.Rule_Category_Car.equals(examineCategory)) {
CheckIndexCar checkIndexCar = new CheckIndexCar();
@@ -76,7 +75,7 @@
//鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�杞﹁締鏁版嵁
List<CheckIndexCar> checkIndexCars = carService.selectCheckIndexCarList(checkIndexCar);
for (CheckIndexCar indexCar : checkIndexCars) {
- addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexCar,CheckConstants.Rule_Category_Car);
+ addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexCar, CheckConstants.Rule_Category_Car);
}
} else if (CheckConstants.Rule_Category_Face.equals(examineCategory)) {
CheckIndexFace checkIndexFace = new CheckIndexFace();
@@ -92,36 +91,17 @@
//鍌ㄥ瓨鍒嗘暟
scoreMapper.saveBatch(scoreList);
+ //TODO锛氭牴鎹姤璀﹀垎鏁伴槇鍊硷紝娣诲姞鎶ヨ淇℃伅
-
- log.info("妯℃澘鎵ц瀹屾垚");
}
- log.info("瀹氭椂浠诲姟鎵ц瀹屾垚");
- }
-
-
- //鏌ongo鏁版嵁褰掓。鍒癿ysql
- public void dataArchiving() {
- //TODO:褰掓。check_index_car,鍖哄垎鐪佸巺甯傚眬锛屾瘡涓尯鍘夸竴鏉℃暟鎹�
- CheckIndexCar checkIndexCar = new CheckIndexCar();
- //TODO:褰掓。check_index_face
- CheckIndexFace checkIndexFace = new CheckIndexFace();
- //TODO:褰掓。check_index_video
- CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
-
}
private <T extends CheckIndex> void addToList(Integer templateId, CheckTemplate checkTemplate, Short examineTag, List<CheckTemplateRule> templateRuleList, List<CheckScore> scoreList, T indexObject, Short checkCategory) {
CheckScore checkScore = new CheckScore();
BigDecimal scoreFinal = BigDecimal.ZERO;
- BigDecimal alarmScore = checkTemplate.getAlarmScore();
for (CheckTemplateRule templateRule : templateRuleList) {
//璁＄畻鍒嗘暟
scoreFinal = getScoreFinal(indexObject, scoreFinal, templateRule);
- //TODO:鏍规嵁鎶ヨ鍒嗘暟闃堝�硷紝娣诲姞鎶ヨ淇℃伅
- if(scoreFinal.compareTo(alarmScore)<0){
-
- }
}
//琛ュ厖checkScore
fillCheckScore(templateId, checkTemplate, examineTag, indexObject, checkScore, scoreFinal, checkCategory);
--
Gitblit v1.8.0