mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/controller/TaskController.java

@@ -1,14 +1,16 @@
 package com.css.simulation.resource.scheduler.controller;
 
 
-import api.common.pojo.dto.ProjectMessageDTO;
 import api.common.util.IoUtil;
 import com.css.simulation.resource.scheduler.consumer.ManualProjectConsumer;
 import com.css.simulation.resource.scheduler.service.TaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
@@ -41,13 +43,13 @@ public class TaskController {
     }
 
 
-    /**
-     * Pod 的心跳接口
-     */
-    @PostMapping("/test")
-    public void test(@RequestBody ProjectMessageDTO projectMessageDTO) {
-        manualProjectConsumer.parseProject1(projectMessageDTO);
-    }
+//    /**
+//     * Pod 的心跳接口
+//     */
+//    @PostMapping("/test")
+//    public void test(@RequestBody ProjectMessageDTO projectMessageDTO) {
+//        manualProjectConsumer.parseProject1(projectMessageDTO);
+//    }
 
     /**
      * Pod 的心跳接口

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/TaskIndexMapper.java

@@ -66,7 +66,7 @@ public interface TaskIndexMapper {
             "    or scene_traffic_ids like #{idExtend}\n" +
             "    or scene_statue_ids like #{idExtend}\n" +
             "    )\n")
-    String selectIndexIdByProjectAndSceneId(@Param("projectId") String projectId, @Param("idExtend") String idExtend);
+    String selectLeafIndexIdByProjectAndSceneId(@Param("projectId") String projectId, @Param("idExtend") String idExtend);
 
 
     @Delete("delete from simulation_mpt_first_target_score where p_id = #{projectId}")

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/TaskMapper.java

@@ -22,6 +22,7 @@ public interface TaskMapper {
             @Result(column = "run_state", property = "runState", jdbcType = JdbcType.VARCHAR),
             @Result(column = "run_result_file_path", property = "runResultFilePath", jdbcType = JdbcType.VARCHAR),
             @Result(column = "max_simulation_time", property = "maxSimulationTime", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "last_targer_id", property = "lastTargetId", jdbcType = JdbcType.VARCHAR)
     })
     @Select("select id,\n" +
             "       p_id,\n" +
@@ -29,7 +30,8 @@ public interface TaskMapper {
             "       scene_name,\n" +
             "       scene_type,\n" +
             "       run_state,\n" +
-            "       run_result_file_path\n" +
+            "       run_result_file_path,\n" +
+            "       last_targer_id\n" +
             "from simulation_manual_project_task\n" +
             "where p_id = #{projectId}")
     List<TaskPO> selectTaskListByProjectId(@Param("projectId") String projectId);

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/TaskIndexPO.java

@@ -19,4 +19,5 @@ public class TaskIndexPO extends CommonPO {
     private Integer notStandardSceneNum;
     private Double score; // 得分
     private String weight; // 得分
+    private String scoreExplain; // 得分
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/TaskService.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Service
@@ -142,6 +143,7 @@ public class TaskService {
         SshClient clientScore = SshUtil.getClient();
         ClientSession sessionScore = SshUtil.getSession(clientScore, hostnameScore, usernameScore, passwordScore);
         for (int i = 0; i < leafIndexTemplateList.size(); i++) {
+            AtomicReference<String> scoreExplain = new AtomicReference<>(); // 每个叶子指标下的任务的得分说明一样和叶子指标一致
             IndexTemplatePO indexTemplatePO = leafIndexTemplateList.get(i);
             String indexId = indexTemplatePO.getIndexId();
             String parentId = indexTemplatePO.getParentId();
@@ -218,6 +220,7 @@ public class TaskService {
                         task2.setScoreExplain(score.getScore_description());
                         task2.setModifyUserId(USER_ID);
                         task2.setModifyTime(TimeUtil.getNowForMysql());
+                        scoreExplain.set(score.getScore_description());
 
                         taskMapper.updateState(task2Id, DictConstants.TASK_COMPLETED);
 
@@ -239,6 +242,7 @@ public class TaskService {
                     .parentId(parentId)
                     .rootId(rootId)
                     .weight(weight)
+                    .scoreExplain(scoreExplain.get())
                     .build();
             leafTaskIndex.setCreateUserId(USER_ID);
             leafTaskIndex.setCreateTime(TimeUtil.getNowForMysql());