|
@@ -4,6 +4,7 @@ import api.common.pojo.constants.DictConstants;
|
|
|
import api.common.util.*;
|
|
|
import com.css.simulation.resource.scheduler.application.repository.TaskIndexRepository;
|
|
|
import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
|
|
|
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.ScoringRuleEntity;
|
|
|
import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.*;
|
|
|
import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
|
|
|
import com.css.simulation.resource.scheduler.infrastructure.entity.*;
|
|
@@ -51,12 +52,12 @@ public class TaskDomainService {
|
|
|
@Resource
|
|
|
private SimulationAutomaticSubprojectMapper simulationAutomaticSubprojectMapper;
|
|
|
@Resource
|
|
|
+ private ScoringRulesMapper scoringRulesMapper;
|
|
|
+ @Resource
|
|
|
private TaskIndexRepository taskIndexRepository;
|
|
|
@Resource
|
|
|
private IndexMapper indexMapper;
|
|
|
@Resource
|
|
|
- private ScoringRulesMapper scoringRulesMapper;
|
|
|
- @Resource
|
|
|
private ProjectDomainService projectDomainService;
|
|
|
@Resource
|
|
|
private SqlSessionFactory sqlSessionFactory;
|
|
@@ -120,7 +121,9 @@ public class TaskDomainService {
|
|
|
String rootId = leafIndexTemplate.getRootId(); // 包 id
|
|
|
String weight = leafIndexTemplate.getWeight(); // 权重
|
|
|
Integer packageLevel = leafIndexTemplate.getPackageLevel(); // 几级指标
|
|
|
- String ruleName = leafIndexTemplate.getRuleName(); // 打分脚本名称,例如 AEB_1-1
|
|
|
+ final String ruleNameArray = leafIndexTemplate.getRuleNameArray();
|
|
|
+ final String rulesId = ruleNameArray.split(",")[1];
|
|
|
+ String ruleName = scoringRulesMapper.selectRuleNameByRulesId(ScoringRuleEntity.builder().rulesId(rulesId).build());
|
|
|
String ruleDetails = leafIndexTemplate.getRuleDetails(); // 打分脚本内容
|
|
|
if (packageLevel > maxLevel) {
|
|
|
maxLevel = packageLevel;
|