mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/ProjectManager.java

@@ -74,7 +74,7 @@ public class ProjectManager {
             String replace12 = replace11.replace("namespace-name", kubernetesConfiguration.getNamespace()); // pod 名称包括 projectId 和 随机字符串
             String replace13 = replace12.replace("node-name", nodeName);     // 指定 pod 运行节点
 
-            String replace14 = replace13.replace("cpu-order", cpuOrder + "");     // 指定 cpu 编号
+            String replace14 = replace13.replace("cpu-order", "\"" + cpuOrder + "\"");     // 指定 cpu 编号
 
             String finalYaml = null;
             if (DictConstants.USE_GPU.equals(isChoiceGpu)) {
@@ -115,7 +115,7 @@ public class ProjectManager {
             String replace17 = replace16.replace("namespace-name", kubernetesConfiguration.getNamespace()); // pod 名称包括 projectId 和 随机字符串
             String replace18 = replace17.replace("node-name", nodeName);     // 指定 pod 运行节点
 
-            String replace19 = replace18.replace("cpu-order", cpuOrder + "");     // 指定 cpu 编号
+            String replace19 = replace18.replace("cpu-order", "\"" + cpuOrder + "\"");     // 指定 cpu 编号
 
             String finalYaml;
             if (DictConstants.USE_GPU.equals(isChoiceGpu)) {

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/ScenePackageController.java

@@ -108,9 +108,7 @@ public class ScenePackageController {
         if (ObjectUtil.isNull(parms.getPackageId())) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "参数 packageId 不能为空，请检查");
         }
-        List<ScenePackageSublistVO> list = scenePackageService.queryScenePackageSublistList(parms);
-
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, list);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, scenePackageService.queryScenePackageSublistList(parms));
     }
 
     //测试包分享

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/SceneGeneralExampleService.java

@@ -27,6 +27,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Service
@@ -166,6 +167,7 @@ public class SceneGeneralExampleService {
         String execute = LinuxUtil.execute("ps -ef | grep main_web.py");
         if (!execute.contains("main_web.py")) {
             LinuxUtil.execute("./service-manager.sh restart", "/root/");
+            TimeUnit.SECONDS.sleep(60);
         }
         String post = HttpUtil.post(HttpUtil.getHttpClient(), requestConfig, generalUrl, null, map);
         log.info("saveSceneGeneralExample() 调用泛化接口--" + generalUrl + "--出参：" + post);

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -155,21 +155,19 @@ public class ScenePackageService {
         if (treeList == null || treeList.size() < 1) {
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "指标数据为空，请检查");
         }
-        if (treeList.size() > 0) {
-            Set<String> set = new HashSet<>();
-            Map<String, String> map = new HashMap<>();
-            for (ScenePackageSublistPO vo : treeList) {
-                Object sublistName = map.get(vo.getSublistName());
-                if (ObjectUtil.isNull(sublistName)) {
-                    map.put(vo.getSublistName(), vo.getSublistName());
-                } else {
-                    set.add(vo.getSublistName());
-                }
-            }
-            if (ObjectUtil.isNotNull(set)) {
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
+        Set<String> set = new HashSet<>();
+        Map<String, String> map = new HashMap<>();
+        for (ScenePackageSublistPO vo : treeList) {
+            Object sublistName = map.get(vo.getSublistName());
+            if (ObjectUtil.isNull(sublistName)) {
+                map.put(vo.getSublistName(), vo.getSublistName());
+            } else {
+                set.add(vo.getSublistName());
             }
         }
+        if (ObjectUtil.isNotNull(set)) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "该条数据中指标名称:" + set + "重复，请检查");
+        }
         po.setIsUnavailable("0");
         scenePackageMapper.updateScenePackage(po);
         scenePackageSublistMapper.deleteScenePackageSublist(po.getPackageId());