mlx

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

@@ -50,6 +50,7 @@ public interface IndexMapper {
             "                                             p_id,\n" +
             "                                             target,\n" +
             "                                             score,\n" +
+            "                                             weight,\n" +
             "                                             create_time,\n" +
             "                                             create_user_id,\n" +
             "                                             modify_time,\n" +
@@ -59,6 +60,7 @@ public interface IndexMapper {
             "        #{first.pId},\n" +
             "        #{first.target},\n" +
             "        #{first.score},\n" +
+            "        #{first.weight},\n" +
             "        #{first.createTime},\n" +
             "        #{first.createUserId},\n" +
             "        #{first.modifyTime},\n" +

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

@@ -77,7 +77,7 @@ public class TaskService {
         log.info("TaskService--taskState 项目 " + projectId + "准备打分！");
         taskManager.prepareScore(redisPrefix.getProjectRunningKey());
         //3 打分
-        taskManager.score(redisPrefix, userId, projectId,projectType, clientSession);
+        taskManager.score(redisPrefix, userId, projectId, projectType, clientSession);
         //4 结束
         taskManager.done(redisPrefix, sshClient, clientSession, projectId);
         log.info("TaskService--taskState 项目 " + projectId + " 执行完成！");

simulation-resource-server/src/main/resources/mapper/project/SimulationMptFirstTargetScoreMapper.xml

@@ -11,11 +11,24 @@
 
     <!--查询项目下所有一级指标-->
     <select id="selectFirstTargetByPid" parameterType="api.common.pojo.po.project.SimulationMptFirstTargetScorePo" resultType="api.common.pojo.po.project.SimulationMptFirstTargetScorePo">
-        select t.*,s.sublist_name,s.scene_num,s.weight, s.sublist_id
-        from simulation_mpt_first_target_score t
-        left join scene_package_sublist s on  t.target = s.sublist_id
-        where t.p_id = #{pId,jdbcType=VARCHAR} and t.is_deleted = '0'
-        order by s.seq
+        select smfts.id,
+               smfts.p_id,
+               smfts.target,
+               smfts.score,
+               smfts.weight,
+               smfts.create_time,
+               smfts.create_user_id,
+               smfts.modify_time,
+               smfts.modify_user_id,
+               smfts.is_deleted,
+               sps.sublist_name,
+               sps.scene_num,
+               sps.sublist_id
+        from simulation_mpt_first_target_score smfts
+                 left join scene_package_sublist sps on smfts.target = sps.sublist_id
+        where smfts.p_id = #{pId,jdbcType=VARCHAR}
+          and smfts.is_deleted = '0'
+        order by sps.seq
     </select>
 
 </mapper>