LingxinMeng 2 роки тому
батько
коміт
26bc85126d

+ 5 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/ProjectService.java

@@ -116,6 +116,11 @@ public class ProjectService {
 
     @Async("pool1")
     public void runProject(ProjectMessageModel projectMessageModel) {
+        String projectId = projectMessageModel.getProjectId();
+        ProjectEntity project = projectDomainService.getProjectByProjectId(projectId);
+        if (project == null) {
+            throw new RuntimeException("不存在项目:" + projectId);
+        }
         //1 创建任务文件并固定场景数据
         createTaskAndFixData(projectMessageModel);
         //2 校验证书和并行度

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/project/mapper/SimulationProjectMapper.java

@@ -142,7 +142,7 @@ public interface SimulationProjectMapper {
     @Update("update simulation_manual_project\n" +
             "set id = #{newId}, details = #{details},now_run_state = #{nowRunState}\n" +
             "where id = #{oldId}")
-    void updateIdAndDetailsAndNowRunStateById(@Param("oldId") String oldId,@Param("newId") String newId, @Param("details") String details, @Param("nowRunState") String nowRunState);
+    void updateIdAndDetailsAndNowRunStateById(@Param("oldId") String oldId, @Param("newId") String newId, @Param("details") String details, @Param("nowRunState") String nowRunState);
 
 
     @Select("select report from simulation_manual_project where id = #{id}")

+ 1 - 1
simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/impl/SimulationProjectServiceImpl.java

@@ -303,7 +303,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             } else if (DictConstants.PROJECT_TERMINATED.equals(oldState)) { //重新运行被终止的项目需要修改新的ID
                 // 如果是重新运行的项目,修改项目ID
                 String newProjectId = StringUtil.getRandomUUID();
-                oldProjectPO.setProjectId(newProjectId);
+                oldProjectPO.setId(newProjectId);
                 String projectDetailsVOJson = JsonUtil.beanToJson(projectDetailsVO);
                 simulationProjectMapper.updateIdAndDetailsAndNowRunStateById(oldProjectId, newProjectId, projectDetailsVOJson, DictConstants.PROJECT_RUNNING);
                 projectRunToKafka(oldProjectPO);