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/task/CheckScoreTask.java | 53 ++++++++++++++++++++++-------------------------------
1 files changed, 22 insertions(+), 31 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..85ab0ec 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -86,50 +86,31 @@
//鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�浜鸿劯鏁版嵁
List<CheckIndexFace> checkIndexFaces = faceService.selectCheckIndexFaceList(checkIndexFace);
for (CheckIndexFace indexFace : checkIndexFaces) {
- addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace, CheckConstants.Rule_Category_Face);
+ addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace,CheckConstants.Rule_Category_Face);
}
}
//鍌ㄥ瓨鍒嗘暟
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) {
+ 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);
+ fillCheckScore(templateId, checkTemplate, examineTag, indexObject, checkScore, scoreFinal,checkCategory);
scoreList.add(checkScore);
}
//閫氱敤鏂规硶璁＄畻鍒嗘暟
- private <T> BigDecimal getScoreFinal(T object, BigDecimal scoreFinal, CheckTemplateRule templateRule) {
+ private <T>BigDecimal getScoreFinal(T object, BigDecimal scoreFinal, CheckTemplateRule templateRule) {
String ruleIndex = templateRule.getRuleIndex();
//灏哸_b_c杞崲涓篴BC
String camelRuleIndex = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, ruleIndex);
@@ -142,27 +123,37 @@
BigDecimal score = index.multiply(templateRule.getWeight());
scoreFinal = scoreFinal.add(score);
} catch (Exception e) {
- log.info("鍙嶅皠寮傚父", e);
+ log.info("鍙嶅皠寮傚父",e);
}
return scoreFinal;
}
-
//璁剧疆checkScore瀵硅薄
- private void fillCheckScore(Integer templateId, CheckTemplate checkTemplate, Short examineTag, CheckIndex checkIndex, CheckScore checkScore, BigDecimal scoreFinal, Short checkCategory) {
+ private void fillCheckScore(Integer templateId, CheckTemplate checkTemplate, Short examineTag, CheckIndex checkIndex, CheckScore checkScore, BigDecimal scoreFinal,Short checkCategory) {
//鏍规嵁璋冩暣绯绘暟璋冩暣鏈�缁堝垎鏁板ぇ灏�
String adjustWay = checkTemplate.getAdjustWay();
BigDecimal adjustCoefficient = checkTemplate.getAdjustCoefficient();
- if (CheckConstants.Multiply.equals(adjustWay)) {
+ if(CheckConstants.Multiply.equals(adjustWay)){
scoreFinal = adjustCoefficient.multiply(scoreFinal).multiply(new BigDecimal(100));
- } else if (CheckConstants.Divided.equals(adjustWay)) {
+ }else if(CheckConstants.Divided.equals(adjustWay)){
//鍥涜垗浜斿叆淇濈暀灏忔暟鍚庡洓浣�
- scoreFinal = scoreFinal.divide(adjustCoefficient, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
+ scoreFinal = scoreFinal.divide(adjustCoefficient,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
}
checkScore.setCreateTime(new Date());
- checkScore.setExamineTag(Integer.parseInt(examineTag + ""));
+ checkScore.setExamineTag(Integer.parseInt(examineTag +""));
checkScore.setExamineCategory(checkCategory);
checkScore.setDeptId(checkIndex.getDeptId());
checkScore.setTemplateId(templateId);
checkScore.setScore(scoreFinal);
}
+
+ //鏌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();
+
+ }
}
--
Gitblit v1.8.0