创建项目

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

@@ -553,7 +553,7 @@ public class ProjectApplicationService {
                 remainderNodeMap.put(currentNodeName, cpuOrder);
             }
             // 只有准备启动（即 currentCount == 0）的时候才指定 cpu 编号
-            log.debug("创建任务 " + taskId + " 的 yaml：是否使用 gpu （0是1否）" + isChoiceGpu + "，当前节点已创建 yaml 个数为：" + currentCount + "，当前节点名称为：" + currentNodeName + "，当前 cpu 编号为：" + cpuOrder);
+            log.debug("创建任务 " + taskId + " 的 yaml：是否使用 gpu （0是1否）" + isChoiceGpu + "，当前节点已创建 yaml 个数为：" + currentCount + "，当前节点名称为：" + currentNodeName + "，当前 cpu 编号为：" + cpuOrder + "，镜像名：" + algorithmDockerImage);
             String yamlRedisKey = projectDomainService.createTempYaml(projectId, vehicleConfigId, modelType, algorithmDockerImage, currentNodeName, partition, offset, isChoiceGpu, cpuOrder);
             if (currentCount == 0) {
                 yamlToRunRedisKeyList.add(yamlRedisKey);
@@ -760,7 +760,7 @@ public class ProjectApplicationService {
                 OsUtil.exec("docker push " + dockerImage);
 //                FileUtil.rm(algorithmTarLinuxTempPath);
 //                log.info("已删除算法临时文件：" + algorithmTarLinuxTempPath);
-                algorithmExpandMapper.updateDockerImportAndDockerImageById(dockerImage, algorithmId);
+                algorithmExpandMapper.updateDockerImportAndDockerImageById("1", dockerImage, algorithmId);
                 algorithmExpandMapper.updateStatusByAlgorithmId(AlgorithmExpandEntity.builder().algorithmId(algorithmId).status(DictConstants.ALGORITHM_EXPAND_STATUS_TESTING).build());
             } else {
                 log.info("算法镜像" + dockerImageWithoutVersion + "已导入。");

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/AlgorithmExpandMapper.java

@@ -10,7 +10,7 @@ public interface AlgorithmExpandMapper {
 
     String selectIdByAlgorithmId(AlgorithmExpandEntity build);
 
-    void updateDockerImportAndDockerImageById(@Param("dockerImage") String dockerImage, @Param("algorithmId") String algorithmId);
+    void updateDockerImportAndDockerImageById(@Param("dockerImport") String dockerImport,@Param("dockerImage") String dockerImage, @Param("algorithmId") String algorithmId);
 
     String selectDockerImageByAlgorithmId(@Param("algorithmId") String algorithmId);
 }

simulation-resource-scheduler/src/main/resources/mysql/mapper/AlgorithmExpandMapper.xml

@@ -12,7 +12,7 @@
         update algorithm_expand
             set docker_import = #{dockerImport},
                 docker_image  = #{dockerImage}
-            where id = #{algorithmId}
+            where algorithm_id = #{algorithmId}
     </update>
     <select id="selectIdByAlgorithmId" resultType="java.lang.String">
         select id from algorithm_expand where algorithm_id = #{algorithmId}

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/SimulationProjectServiceImpl.java

@@ -122,11 +122,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         SimulationManualProjectPO po = convertParamToPo(param);
 
         if (isEmpty(param.getId())) {
-            // 工作名称一样的的不能创建
-            List<SimulationManualProjectPO> simulationManualProjectPOS = simulationManualProjectMapper.selectProjectByName(param);
-            if (!isEmpty(simulationManualProjectPOS)) {
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "工作名称已经存在，请修改后再保存。");
-            }
+//            // 工作名称一样的的不能创建
+//            List<SimulationManualProjectPO> simulationManualProjectPOS = simulationManualProjectMapper.selectProjectByName(param);
+//            if (!isEmpty(simulationManualProjectPOS)) {
+//                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "工作名称已经存在，请修改后再保存。");
+//            }
             po.createPo(AuthUtil.getCurrentUserId());
             // 生成id
             createProjectId(po);