From 3e9a6da99aae968123ee7bca352fc08becd7f1f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 17:29:21 +0800
Subject: [PATCH] 工单过程图接口更换
---
ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 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..2637b74 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -13,6 +13,7 @@
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.lang.reflect.Field;
import java.math.BigDecimal;
@@ -33,14 +34,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 +66,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 +76,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();
@@ -89,39 +89,19 @@
addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace, CheckConstants.Rule_Category_Face);
}
}
-
//鍌ㄥ瓨鍒嗘暟
- scoreMapper.saveBatch(scoreList);
-
-
- log.info("妯℃澘鎵ц瀹屾垚");
+ if(!CollectionUtils.isEmpty(scoreList)) {
+ scoreMapper.saveBatch(scoreList);
+ }
}
- 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);
@@ -142,7 +122,7 @@
BigDecimal score = index.multiply(templateRule.getWeight());
scoreFinal = scoreFinal.add(score);
} catch (Exception e) {
- log.info("鍙嶅皠寮傚父", e);
+ log.info("鍙嶅皠寮傚父", e.getMessage());
}
return scoreFinal;
}
--
Gitblit v1.8.0