commit

simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/infra/scheduler/MinioCleanScheduler.java

@@ -51,7 +51,7 @@ public class MinioCleanScheduler {
             List<String> strings = simulationManualProjectMapper.selectIds();
             for (String object : objects) {
                 String[] split = object.split("/");
-                if (!strings.contains(split[0])) {
+                if (!strings.contains(split[1])) {
                     MinioUtil.removeObject(minioClient, minioConfiguration.getBucketName(), object);
                 }
             }

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

@@ -408,28 +408,34 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         String algorithmType;
         String algorithmId;
         String projectId;
+        String createTime;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) { // 手动运行任务
             SimulationManualProjectPO simulationManualProjectPO = simulationManualProjectMapper.selectProjectById(param);
             details = simulationManualProjectPO.getDetails();
             algorithmType = simulationManualProjectPO.getAlgorithmType();
             algorithmId = simulationManualProjectPO.getAlgorithm();
             projectId = simulationManualProjectPO.getProjectId();
+            createTime = String.valueOf(simulationManualProjectPO.getCreateTime());
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
             SimulationManualProjectVO simulationManualProjectVO = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
             details = simulationManualProjectVO.getDetails();
             algorithmType = simulationManualProjectVO.getAlgorithmType();
             algorithmId = simulationManualProjectVO.getAlgorithm();
             projectId = simulationManualProjectVO.getProjectId();
+            createTime = String.valueOf(simulationManualProjectVO.getCreateTime());
         } else {
             throw new RuntimeException("未知项目类型：" + projectType);
         }
         projectDetailsVO = JsonUtil.jsonToBean(details, ProjectDetailsVO.class);
 
-        // 修正项目ID
+        // 修正项目ID、创建时间
         {
             projectDetailsVO.setProjectId(projectId);
+            if (StringUtil.isEmpty(projectDetailsVO.getStartTime())) {
+                projectDetailsVO.setStartTime(createTime);
+            }
         }
-        //TODO 修正算法名称，后期可删掉
+        //修正算法名称
         {
             String algorithmName = null;
             String algorithmDescription = null;
@@ -440,7 +446,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                     algorithmName = algorithmVO.getAlgorithmName() + "-" + algorithmVO.getAlgorithmVersion();
                     algorithmDescription = select.get(0).getDescription();
                 }
-                //TODO 暂时不处理非算法平台的算法
+                // 暂时不处理非算法平台的算法
                 projectDetailsVO.setAlgorithmName(algorithmName);
                 projectDetailsVO.setAlgorithmDescribe(algorithmDescription);
             }