LingxinMeng %!s(int64=2) %!d(string=hai) anos
pai
achega
ba3f78e87f

+ 6 - 3
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java

@@ -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;

+ 14 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/ScoringRuleEntity.java

@@ -0,0 +1,14 @@
+package com.css.simulation.resource.scheduler.infrastructure.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ScoringRuleEntity {
+    private String rulesId;
+}

+ 1 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/IndexTemplateMapper.java

@@ -39,6 +39,7 @@ public interface IndexTemplateMapper {
             "       sps.root_id,\n" +
             "       sps.package_level,\n" +
             "       sps.rule_name,\n" +
+            "       sps.rule_name_array,\n" +
             "       sps.package_and_rules,\n" +
             "       sr.rule_details\n" +
             "from scene_package_sublist sps left join scoring_rules sr on sps.package_and_rules = sr.rules_id\n" +

+ 2 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/ScoringRulesMapper.java

@@ -1,6 +1,7 @@
 package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.ScoringRuleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -20,4 +21,5 @@ public interface ScoringRulesMapper {
     String selectCreateUserIdByIndexId(@Param("indexId") String indexId);
 
 
+    String  selectRuleNameByRulesId(ScoringRuleEntity build);
 }

+ 1 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/entity/IndexTemplateEntity.java

@@ -24,6 +24,7 @@ public class IndexTemplateEntity {
     private Double tempScore;
     private Integer packageLevel; // 指标等级
     private String ruleId; // 指标等级
+    private String ruleNameArray; // 指标等级
 
     @Override
     public String toString() {

+ 11 - 0
simulation-resource-scheduler/src/main/resources/mysql/mapper/ScoringRulesMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.ScoringRulesMapper">
+
+
+    <select id="selectRuleNameByRulesId" resultType="java.lang.String">
+        select rule_name
+        from simulation.scoring_rules
+        where rules_id = #{rulesId}
+    </select>
+</mapper>