martin

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

@@ -24,11 +24,9 @@ public class TaskController {
      * 修改任务状态
      */
     @GetMapping("/state")
-    public void taskState(
-            @RequestParam("taskId") String taskId,
-            @RequestParam("state") String state,
-            @RequestParam("podName") String podName
-    ) {
+    public void taskState(@RequestParam("taskId") String taskId,
+                          @RequestParam("state") String state,
+                          @RequestParam("podName") String podName) {
         taskService.taskState(taskId, state, podName);
     }
 

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

@@ -285,7 +285,7 @@ public class TaskManager {
                             taskOfLeaf.setScore(0.0);
                             taskOfLeaf.setScored(false);
                         } else {
-                            taskOfLeaf.setScore(taskScore);
+                            taskOfLeaf.setScore(NumberUtil.cut(taskScore, 2));
                             taskOfLeaf.setScored(true);
                         }
                         taskMapper.updateSuccessState(taskOfLeaf, DictConstants.TASK_COMPLETED);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScoringRulesMapper.java

@@ -48,6 +48,6 @@ public interface ScoringRulesMapper {
             "</script>")
     List<String> selectRuleNamesByRuleIds(@Param("ruleIds") List<String> ruleIds);
 
-    @Select("select is_deleted from scoring_rules where rules_id = #{rulesId}}")
+    @Select("select is_deleted from scoring_rules where rules_id = #{ruleId}")
     String selectIsDeletedByRuleId(@Param("ruleId")String ruleId);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/util/SceneUtil.java

@@ -46,8 +46,8 @@ public class SceneUtil {
             final String ruleId = ruleIdArray[ruleIdArray.length - 1];
             final String isDeleted = scoringRulesMapper.selectIsDeletedByRuleId(ruleId);
             if (DictConstants.IS_DELETED.equals(isDeleted)) {
-                throw new RuntimeException("指标 " + scenePackageSublistVO.getSublistName() + " 关联的评分规则 "
-                        + scenePackageSublistVO.getRuleName()+" 已被删除。");
+                throw new RuntimeException("指标【" + scenePackageSublistVO.getSublistName() + "】关联的评分规则【"
+                        + scenePackageSublistVO.getRuleName()+"】已被删除。");
             }
         }
     }