算法平台

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

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.api.controller;
 
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.application.service.AlgorithmService;
+import com.css.simulation.resource.scheduler.application.service.AlgorithmApplicationService;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -16,14 +16,14 @@ import javax.annotation.Resource;
 public class AlgorithmController {
 
     @Resource
-    AlgorithmService algorithmService;
+    AlgorithmApplicationService algorithmApplicationService;
 
 
     @RequestMapping("/check")
     public ResponseBodyVO<String> check(
             @RequestParam("minioPath") String minioPath
     ) {
-        return algorithmService.check(minioPath);
+        return algorithmApplicationService.check(minioPath);
     }
 
 }

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

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.scheduler.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.application.service.FileService;
+import com.css.simulation.resource.scheduler.application.service.FileApplicationService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;
@@ -15,13 +15,13 @@ import javax.annotation.Resource;
 @Slf4j
 public class CpuNodeController {
     @Resource
-    private FileService fileService;
+    private FileApplicationService fileApplicationService;
 
     @RequestMapping(value = "/uploadOsgb")
     public ResponseBodyVO<String> uploadOsgb(
             @RequestPart("file") MultipartFile file
     ) {
-        fileService.uploadOsgb(file);
+        fileApplicationService.uploadOsgb(file);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 

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

@@ -1,7 +1,7 @@
 package com.css.simulation.resource.scheduler.api.controller;
 
 
-import com.css.simulation.resource.scheduler.application.service.TaskService;
+import com.css.simulation.resource.scheduler.application.service.TaskApplicationService;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,7 +16,7 @@ import javax.annotation.Resource;
 public class TaskController {
 
     @Resource
-    private TaskService taskService;
+    private TaskApplicationService taskApplicationService;
     //* -------------------------------- Comment --------------------------------
 
     /**
@@ -24,7 +24,7 @@ public class TaskController {
      */
     @GetMapping("/confirm")
     public Boolean confirm(@RequestParam("taskId") String taskId) {
-        return taskService.confirm(taskId);
+        return taskApplicationService.confirm(taskId);
     }
 
     // -------------------------------- Comment --------------------------------
@@ -34,7 +34,7 @@ public class TaskController {
      */
     @GetMapping("/tick")
     public void tick(@RequestParam("taskId") String taskId) {
-        taskService.tick(taskId);
+        taskApplicationService.tick(taskId);
     }
     //* -------------------------------- Comment --------------------------------
 
@@ -43,7 +43,7 @@ public class TaskController {
      */
     @GetMapping("/state")
     public void state(@RequestParam("taskId") String taskId, @RequestParam("state") String state, @RequestParam("podName") String podName) {
-        taskService.state(taskId, state, podName);
+        taskApplicationService.state(taskId, state, podName);
     }
 
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/repository/TaskIndexRepository.java

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.scheduler.application.repository;
 
-import com.css.simulation.resource.scheduler.infrastructure.mysql.mapper.IndexMapper;
+import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.IndexMapper;
 import com.css.simulation.resource.scheduler.infrastructure.entity.LeafIndexEntity;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/AlgorithmService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/AlgorithmApplicationService.java

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.application.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.util.FileUtil;
-import com.css.simulation.resource.scheduler.infrastructure.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infrastructure.file.minio.MinioUtil;
 import io.minio.MinioClient;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,7 +12,7 @@ import javax.annotation.Resource;
 import java.io.InputStream;
 
 @Service
-public class AlgorithmService {
+public class AlgorithmApplicationService {
 
 
     @Resource

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/FileService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/FileApplicationService.java

@@ -14,7 +14,7 @@ import java.io.File;
 import java.util.List;
 
 @Service
-public class FileService {
+public class FileApplicationService {
     @Resource
     KubernetesConfiguration kubernetesConfiguration;
     @Resource

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/ProjectService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/ProjectApplicationService.java

@@ -11,13 +11,14 @@ import com.css.simulation.resource.scheduler.infrastructure.configuration.custom
 import com.css.simulation.resource.scheduler.infrastructure.configuration.docker.DockerConfiguration;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.DynamicsEntity;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.git.GitConfiguration;
+import com.css.simulation.resource.scheduler.infrastructure.configuration.git.GitUtil;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.AlgorithmExpandEntity;
+import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.*;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
 import com.css.simulation.resource.scheduler.infrastructure.entity.*;
-import com.css.simulation.resource.scheduler.infrastructure.git.GitUtil;
-import com.css.simulation.resource.scheduler.infrastructure.kafka.KafkaUtil;
-import com.css.simulation.resource.scheduler.infrastructure.minio.MinioUtil;
-import com.css.simulation.resource.scheduler.infrastructure.mysql.mapper.*;
-import com.css.simulation.resource.scheduler.infrastructure.redis.CustomRedisClient;
-import com.css.simulation.resource.scheduler.infrastructure.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infrastructure.file.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infrastructure.mq.kafka.KafkaUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;
@@ -42,7 +43,7 @@ import java.util.stream.Collectors;
 
 @Service
 @Slf4j
-public class ProjectService {
+public class ProjectApplicationService {
 
     @Value("${scheduler.minio-path.project-result}")
     private String projectResultPathOfMinio;
@@ -91,11 +92,13 @@ public class ProjectService {
     @Resource
     private GitConfiguration gitConfiguration;
     @Resource
-    private ManualProjectMapper manualProjectMapper;
+    private SimulationManualProjectMapper simulationManualProjectMapper;
     @Resource
-    private AutoSubProjectMapper autoSubProjectMapper;
+    private SimulationAutomaticSubprojectMapper simulationAutomaticSubprojectMapper;
     @Resource
     private CustomRedisClient customRedisClient;
+    @Resource
+    private AlgorithmExpandMapper algorithmExpandMapper;
 
     // -------------------------------- Comment --------------------------------
 
@@ -725,10 +728,11 @@ public class ProjectService {
                 if (algorithmTarLinuxTempPath == null) {
                     throw new RuntimeException("算法" + algorithmId + "下载失败。");
                 }
-                LinuxUtil.execute("docker import " + algorithmTarLinuxTempPath + " " + dockerImage);
-                LinuxUtil.execute("docker push " + dockerImage);
+                OsUtil.exec("docker import " + algorithmTarLinuxTempPath + " " + dockerImage);
+                OsUtil.exec("docker push " + dockerImage);
                 FileUtil.rm(algorithmTarLinuxTempPath);
-                log.info("已删除算法临时文件：" + algorithmTarLinuxTempPath);
+                log.debug("已删除算法临时文件：" + algorithmTarLinuxTempPath);
+                algorithmExpandMapper.updateStatusByAlgorithmId(AlgorithmExpandEntity.builder().algorithmId(algorithmId).status(DictConstants.ALGORITHM_EXPAND_STATUS_TESTING).build());
             } else {
                 throw new RuntimeException("算法 " + algorithmId + " 的 mysql 数据有误！");
             }
@@ -793,11 +797,11 @@ public class ProjectService {
         isRunning = !CollectionUtil.isEmpty(projectRunningKeySet);
         //2 将项目状态修改为终止中
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            projectEntity = manualProjectMapper.selectById(projectId);
-            manualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
+            projectEntity = simulationManualProjectMapper.selectById(projectId);
+            simulationManualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            projectEntity = autoSubProjectMapper.selectById(projectId);
-            autoSubProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
+            projectEntity = simulationAutomaticSubprojectMapper.selectById(projectId);
+            simulationAutomaticSubprojectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
         } else {
             throw new RuntimeException("未知项目类型：" + projectType);
         }
@@ -842,13 +846,16 @@ public class ProjectService {
 
         log.info("项目 " + projectId + " 终止成功！");
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            manualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATED, TimeUtil.getNowForMysql());
+            simulationManualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATED, TimeUtil.getNowForMysql());
         } else {
-            autoSubProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATED, TimeUtil.getNowForMysql());
+            simulationAutomaticSubprojectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATED, TimeUtil.getNowForMysql());
         }
 
         //9 如果在打分过程中被终止需要删除锁
         customRedisClient.delete("project:" + projectId + ":completed-lock");
+
+        //10 如果使用算法平台算法则修改算法状态为未测试
+        projectDomainService.checkAlgorithmIsExpand(projectType, projectId, DictConstants.ALGORITHM_EXPAND_STATUS_NOT_TESTED);
     }
 
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/TaskService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/TaskApplicationService.java

@@ -7,14 +7,14 @@ import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService
 import com.css.simulation.resource.scheduler.domain.service.TaskDomainService;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.kubernetes.KubernetesUtil;
-import com.css.simulation.resource.scheduler.infrastructure.minio.MinioUtil;
-import com.css.simulation.resource.scheduler.infrastructure.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesUtil;
+import com.css.simulation.resource.scheduler.infrastructure.file.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
 import com.css.simulation.resource.scheduler.infrastructure.entity.PrefixEntity;
 import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
 import com.css.simulation.resource.scheduler.infrastructure.entity.TaskEntity;
-import com.css.simulation.resource.scheduler.infrastructure.mysql.mapper.TaskMapper;
-import com.css.simulation.resource.scheduler.infrastructure.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.TaskMapper;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
 import io.kubernetes.client.openapi.ApiClient;
 import io.minio.MinioClient;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 
 @Service
 @Slf4j
-public class TaskService {
+public class TaskApplicationService {
     @Value("${minio.bucket-name}")
     private String bucketName;
     @Value("${scheduler.minio-path.project-result}")

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

@@ -9,13 +9,17 @@ import com.css.simulation.resource.scheduler.infrastructure.configuration.custom
 import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.NodeEntity;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesConfiguration;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.minio.MinioConfiguration;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.AlgorithmExpandEntity;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticProjectEntity;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationManualProjectEntity;
+import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.*;
 import com.css.simulation.resource.scheduler.infrastructure.entity.PrefixEntity;
 import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
 import com.css.simulation.resource.scheduler.infrastructure.entity.UserEntity;
-import com.css.simulation.resource.scheduler.infrastructure.kubernetes.KubernetesUtil;
-import com.css.simulation.resource.scheduler.infrastructure.mysql.mapper.*;
-import com.css.simulation.resource.scheduler.infrastructure.redis.CustomRedisClient;
-import com.css.simulation.resource.scheduler.infrastructure.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes.KubernetesUtil;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -66,15 +70,19 @@ public class ProjectDomainService {
     @Resource
     private MinioConfiguration minioConfiguration;
     @Resource
-    private ManualProjectMapper manualProjectMapper;
+    private SimulationManualProjectMapper simulationManualProjectMapper;
     @Resource
-    private AutoSubProjectMapper autoSubProjectMapper;
+    private SimulationAutomaticProjectMapper simulationAutomaticProjectMapper;
+    @Resource
+    private SimulationAutomaticSubprojectMapper simulationAutomaticSubprojectMapper;
     @Resource
     private CustomRedisClient customRedisClient;
     @Resource
     private UserMapper userMapper;
     @Resource
     private ApiClient apiClient;
+    @Resource
+    private AlgorithmExpandMapper algorithmExpandMapper;
 
 
     /**
@@ -320,8 +328,8 @@ public class ProjectDomainService {
 
 
     public ProjectEntity getProjectByProjectId(String projectId) {
-        ProjectEntity manualProjectEntity = manualProjectMapper.selectById(projectId);
-        ProjectEntity autoSubProjectEntity = autoSubProjectMapper.selectById(projectId);
+        ProjectEntity manualProjectEntity = simulationManualProjectMapper.selectById(projectId);
+        ProjectEntity autoSubProjectEntity = simulationAutomaticSubprojectMapper.selectById(projectId);
         if (manualProjectEntity != null) {
             return manualProjectEntity;
         } else if (autoSubProjectEntity != null) {
@@ -600,9 +608,9 @@ public class ProjectDomainService {
     public PrefixEntity getRedisPrefixByProjectIdAndProjectType(String projectId, String projectType) {
         String userId;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            userId = manualProjectMapper.selectCreateUserById(projectId);
+            userId = simulationManualProjectMapper.selectCreateUserById(projectId);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            userId = autoSubProjectMapper.selectCreateUserById(projectId);
+            userId = simulationAutomaticSubprojectMapper.selectCreateUserById(projectId);
         } else {
             throw new RuntimeException("未知的项目类型。");
         }
@@ -802,9 +810,9 @@ public class ProjectDomainService {
 
     public String getModelTypeByProjectIdAndProjectType(String projectId, String projectType) {
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            return manualProjectMapper.selectModelTypeByProjectId(projectId);
+            return simulationManualProjectMapper.selectModelTypeByProjectId(projectId);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            return autoSubProjectMapper.selectModelTypeByProjectId(projectId);
+            return simulationAutomaticSubprojectMapper.selectModelTypeByProjectId(projectId);
         } else {
             throw new RuntimeException("未知项目类型：" + projectType);
         }
@@ -812,9 +820,9 @@ public class ProjectDomainService {
 
     public String getUserIdByProjectIdAndProjectType(String projectId, String projectType) {
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            return manualProjectMapper.selectCreateUserById(projectId);
+            return simulationManualProjectMapper.selectCreateUserById(projectId);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            return autoSubProjectMapper.selectCreateUserById(projectId);
+            return simulationAutomaticSubprojectMapper.selectCreateUserById(projectId);
         } else {
             throw new RuntimeException("未知项目类型：" + projectType);
         }
@@ -855,9 +863,9 @@ public class ProjectDomainService {
         String projectDetailsVOJson = JsonUtil.beanToJson(responseBodyVO.getInfo());
         TimeUnit.SECONDS.sleep(3);
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            manualProjectMapper.updateProjectDetails(projectId, projectDetailsVOJson);
+            simulationManualProjectMapper.updateProjectDetails(projectId, projectDetailsVOJson);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            autoSubProjectMapper.updateProjectDetails(projectId, projectDetailsVOJson);
+            simulationAutomaticSubprojectMapper.updateProjectDetails(projectId, projectDetailsVOJson);
         } else {
             throw new RuntimeException("未知项目类型：" + projectType);
         }
@@ -884,9 +892,9 @@ public class ProjectDomainService {
         String projectReportVOJson = JsonUtil.beanToJson(responseBodyVO.getInfo());
         TimeUnit.SECONDS.sleep(3);
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            manualProjectMapper.updateProjectReport(projectId, projectReportVOJson);
+            simulationManualProjectMapper.updateProjectReport(projectId, projectReportVOJson);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            autoSubProjectMapper.updateProjectReport(projectId, projectReportVOJson);
+            simulationAutomaticSubprojectMapper.updateProjectReport(projectId, projectReportVOJson);
         } else {
             throw new RuntimeException("未知项目类型：" + projectType);
         }
@@ -946,4 +954,26 @@ public class ProjectDomainService {
     }
 
 
+    /**
+     * 如果是算法平台算法则修改状态
+     * @param projectType
+     * @param projectId
+     */
+    public void checkAlgorithmIsExpand(String projectType, String projectId,String algorithmStatus) {
+        String algorithmType;
+        String algorithmId;
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
+            algorithmType = simulationManualProjectMapper.selectAlgorithmTypeById(SimulationManualProjectEntity.builder().id(projectId).build());
+            algorithmId = simulationManualProjectMapper.selectAlgorithmById(SimulationManualProjectEntity.builder().id(projectId).build());
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
+            String automaticProjectId = simulationAutomaticSubprojectMapper.selectParentIdById(SimulationAutomaticSubprojectEntity.builder().id(projectId).build());
+            algorithmType = simulationAutomaticProjectMapper.selectAlgorithmTypeById(SimulationAutomaticProjectEntity.builder().id(automaticProjectId).build());
+            algorithmId = simulationAutomaticProjectMapper.selectAlgorithmById(SimulationAutomaticProjectEntity.builder().id(automaticProjectId).build());
+        } else {
+            throw new RuntimeException("未知项目类型：" + projectType);
+        }
+        if(DictConstants.ALGORITHM_UPLOAD_MODE_PLATFORM.equals(algorithmType)) {
+            algorithmExpandMapper.updateStatusByAlgorithmId(AlgorithmExpandEntity.builder().algorithmId(algorithmId).status(algorithmStatus).build());
+        }
+    }
 }

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

@@ -2,13 +2,13 @@ package com.css.simulation.resource.scheduler.domain.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
+import com.css.simulation.resource.scheduler.application.repository.TaskIndexRepository;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
+import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.*;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.RedisUtil;
 import com.css.simulation.resource.scheduler.infrastructure.entity.*;
-import com.css.simulation.resource.scheduler.infrastructure.mysql.mapper.*;
-import com.css.simulation.resource.scheduler.application.repository.TaskIndexRepository;
-import com.css.simulation.resource.scheduler.infrastructure.kafka.KafkaUtil;
-import com.css.simulation.resource.scheduler.infrastructure.minio.MinioUtil;
-import com.css.simulation.resource.scheduler.infrastructure.redis.RedisUtil;
+import com.css.simulation.resource.scheduler.infrastructure.file.minio.MinioUtil;
+import com.css.simulation.resource.scheduler.infrastructure.mq.kafka.KafkaUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;
@@ -47,9 +47,9 @@ public class TaskDomainService {
     @Resource
     private MinioClient minioClient;
     @Resource
-    private ManualProjectMapper manualProjectMapper;
+    private SimulationManualProjectMapper simulationManualProjectMapper;
     @Resource
-    private AutoSubProjectMapper autoSubProjectMapper;
+    private SimulationAutomaticSubprojectMapper simulationAutomaticSubprojectMapper;
     @Resource
     private TaskIndexRepository taskIndexRepository;
     @Resource
@@ -85,9 +85,9 @@ public class TaskDomainService {
         // -------------------------------- 打分 --------------------------------
         ProjectEntity projectEntity = null;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            projectEntity = manualProjectMapper.selectById(projectId);
+            projectEntity = simulationManualProjectMapper.selectById(projectId);
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            projectEntity = autoSubProjectMapper.selectById(projectId);
+            projectEntity = simulationAutomaticSubprojectMapper.selectById(projectId);
         }
         if (projectEntity == null) {
             log.error("不存在项目 {}", projectId);
@@ -340,9 +340,9 @@ public class TaskDomainService {
     public void done(PrefixEntity redisPrefix, String projectId, String projectType) {
         // 更新项目状态为已完成
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
-            manualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_COMPLETED, TimeUtil.getNowForMysql());
+            simulationManualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_COMPLETED, TimeUtil.getNowForMysql());
         } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
-            autoSubProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_COMPLETED, TimeUtil.getNowForMysql());
+            simulationAutomaticSubprojectMapper.updateProjectState(projectId, DictConstants.PROJECT_COMPLETED, TimeUtil.getNowForMysql());
         }
         // 删除 kafka topic
         KafkaUtil.deleteTopic(admin, projectId);
@@ -355,6 +355,8 @@ public class TaskDomainService {
         projectDomainService.selectProjectDetailsById(projectType, projectId);
         // 查询并保存项目报告
         projectDomainService.selectProjectReportById(projectType, projectId);
+        // 如果使用算法平台算法则修改状态为测试完成
+        projectDomainService.checkAlgorithmIsExpand(projectType,projectId,DictConstants.ALGORITHM_EXPAND_STATUS_TESTED);
     }
 
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/git/GitUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/git/GitUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.git;
+package com.css.simulation.resource.scheduler.infrastructure.configuration.git;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/init/CustomApplicationRunner.java

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.scheduler.infrastructure.configuration.init;
 
-import com.css.simulation.resource.scheduler.infrastructure.redis.CustomRedisClient;
+import com.css.simulation.resource.scheduler.infrastructure.db.redis.CustomRedisClient;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/kubernetes/KubernetesUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/kubernetes/KubernetesUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.kubernetes;
+package com.css.simulation.resource.scheduler.infrastructure.configuration.kubernetes;
 
 import api.common.util.OsUtil;
 import io.kubernetes.client.openapi.ApiClient;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/scheduler/AlgorithmScheduler.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/scheduler/AlgorithmScheduler.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.scheduler.infrastructure.scheduler;
+package com.css.simulation.resource.scheduler.infrastructure.configuration.scheduler;
 
 import api.common.util.SshUtil;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.docker.DockerConfiguration;
-import com.css.simulation.resource.scheduler.infrastructure.mysql.mapper.AlgorithmMapper;
+import com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.AlgorithmMapper;
 import com.css.simulation.resource.scheduler.infrastructure.entity.AlgorithmEntity;
 import com.css.simulation.resource.scheduler.infrastructure.configuration.entity.DockerNodeEntity;
 import lombok.SneakyThrows;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/scheduler/ProjectScheduler.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/configuration/scheduler/ProjectScheduler.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.scheduler.infrastructure.scheduler;
+package com.css.simulation.resource.scheduler.infrastructure.configuration.scheduler;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.CollectionUtil;
 import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
 import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
-import com.css.simulation.resource.scheduler.application.service.ProjectService;
+import com.css.simulation.resource.scheduler.application.service.ProjectApplicationService;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +18,7 @@ import java.util.List;
 @Slf4j
 public class ProjectScheduler {
     @Resource
-    private ProjectService projectService;
+    private ProjectApplicationService projectApplicationService;
     @Resource
     private ProjectDomainService projectDomainService;
 
@@ -33,7 +33,7 @@ public class ProjectScheduler {
             String waitingType = projectWaitQueueEntity.getWaitingType();
             if (DictConstants.PROJECT_WAIT_TYPE_EXECUTE.equals(waitingType)) {
                 log.debug("尝试启动等待中的项目：{}", projectWaitQueueEntity);
-                projectService.checkIfCanRun(projectWaitQueueEntity);
+                projectApplicationService.checkIfCanRun(projectWaitQueueEntity);
             } else if (DictConstants.PROJECT_WAIT_TYPE_EXPAND.equals(waitingType)) {
                 log.debug("尝试扩充运行中的项目：{}", projectWaitQueueEntity);
                 ProjectMessageModel projectMessageModel = projectWaitQueueEntity.getProjectMessageModel();
@@ -45,7 +45,7 @@ public class ProjectScheduler {
                     projectDomainService.setWaitQueue(projectWaitQueue);
                     return;
                 }
-                projectService.checkIfCanRun(projectWaitQueueEntity);
+                projectApplicationService.checkIfCanRun(projectWaitQueueEntity);
             }
         }
     }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/AlgorithmExpandEntity.java

@@ -0,0 +1,16 @@
+package com.css.simulation.resource.scheduler.infrastructure.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class AlgorithmExpandEntity {
+    private String id;
+    private String algorithmId;
+    private String status;
+}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/SimulationAutomaticProjectEntity.java

@@ -0,0 +1,14 @@
+package com.css.simulation.resource.scheduler.infrastructure.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimulationAutomaticProjectEntity {
+    private String id;
+}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/SimulationAutomaticSubprojectEntity.java

@@ -0,0 +1,14 @@
+package com.css.simulation.resource.scheduler.infrastructure.db.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimulationAutomaticSubprojectEntity {
+    private String id;
+}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/entity/SimulationManualProjectEntity.java

@@ -0,0 +1,11 @@
+package com.css.simulation.resource.scheduler.infrastructure.db.entity;
+
+import lombok.*;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimulationManualProjectEntity {
+    private String id;
+}

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

@@ -0,0 +1,9 @@
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.AlgorithmExpandEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AlgorithmExpandMapper {
+    void updateStatusByAlgorithmId(AlgorithmExpandEntity algorithmExpandEntity);
+}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/AlgorithmMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/AlgorithmMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.AlgorithmEntity;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/ClusterMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/ClusterMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.ClusterEntity;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/ConfigMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/ConfigMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/IndexMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/IndexMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.LeafIndexEntity;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/IndexTemplateMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/IndexTemplateMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.IndexTemplateEntity;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/SceneMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SceneMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.IndexTemplateEntity;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/ScoringRulesMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/ScoringRulesMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import org.apache.ibatis.annotations.Mapper;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/SensorCameraMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SensorCameraMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.CameraEntity;
 import org.apache.ibatis.annotations.*;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/SensorOgtMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SensorOgtMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.OgtEntity;
 import org.apache.ibatis.annotations.*;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SimulationAutomaticProjectMapper.java

@@ -0,0 +1,13 @@
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
+
+
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticProjectEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SimulationAutomaticProjectMapper {
+
+    String selectAlgorithmTypeById(SimulationAutomaticProjectEntity build);
+
+    String selectAlgorithmById(SimulationAutomaticProjectEntity build);
+}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/AutoSubProjectMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SimulationAutomaticSubprojectMapper.java

@@ -1,7 +1,9 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.po.scheduler.SchedulerProjectPO;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticProjectEntity;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationAutomaticSubprojectEntity;
 import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
@@ -9,7 +11,7 @@ import org.apache.ibatis.type.JdbcType;
 import java.sql.Timestamp;
 
 @Mapper
-public interface AutoSubProjectMapper {
+public interface SimulationAutomaticSubprojectMapper {
 
     @Results(id = "project", value = {
             @Result(column = "id", property = "id", jdbcType = JdbcType.VARCHAR),
@@ -70,4 +72,8 @@ public interface AutoSubProjectMapper {
             "set report  = #{report}\n" +
             "where id = #{id}")
     void updateProjectReport(@Param("id") String id, @Param("report") String report);
+
+    String selectParentIdById(SimulationAutomaticSubprojectEntity build);
+
+
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/ManualProjectMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/SimulationManualProjectMapper.java

@@ -1,7 +1,8 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import api.common.pojo.po.scheduler.SchedulerProjectPO;
+import com.css.simulation.resource.scheduler.infrastructure.db.entity.SimulationManualProjectEntity;
 import com.css.simulation.resource.scheduler.infrastructure.entity.ProjectEntity;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
@@ -9,7 +10,7 @@ import org.apache.ibatis.type.JdbcType;
 import java.sql.Timestamp;
 
 @Mapper
-public interface ManualProjectMapper {
+public interface SimulationManualProjectMapper {
 
     @Results(id = "project", value = {
             @Result(column = "id", property = "id", jdbcType = JdbcType.VARCHAR),
@@ -66,4 +67,9 @@ public interface ManualProjectMapper {
             "set report = #{report}\n" +
             "where id = #{id}")
     void updateProjectReport(@Param("id") String id,@Param("report") String report);
+
+
+    String selectAlgorithmTypeById(SimulationManualProjectEntity build);
+
+    String selectAlgorithmById(SimulationManualProjectEntity build);
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/TaskMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/TaskMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.TaskEntity;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/UserMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/UserMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.UserEntity;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/VehicleMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/mysql/mapper/VehicleMapper.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
+package com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper;
 
 import com.css.simulation.resource.scheduler.infrastructure.entity.VehicleEntity;
 import org.apache.ibatis.annotations.*;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/redis/CustomRedisClient.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/redis/CustomRedisClient.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.redis;
+package com.css.simulation.resource.scheduler.infrastructure.db.redis;
 
 import api.common.util.CollectionUtil;
 import lombok.SneakyThrows;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/redis/RedisUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/db/redis/RedisUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.redis;
+package com.css.simulation.resource.scheduler.infrastructure.db.redis;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/minio/MinioUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/file/minio/MinioUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.minio;
+package com.css.simulation.resource.scheduler.infrastructure.file.minio;
 
 import io.minio.*;
 import io.minio.errors.*;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/kafka/KafkaUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mq/kafka/KafkaUtil.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.infrastructure.kafka;
+package com.css.simulation.resource.scheduler.infrastructure.mq.kafka;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/api/consumer/ProjectConsumer.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mq/kafka/consumer/ProjectConsumer.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.scheduler.api.consumer;
+package com.css.simulation.resource.scheduler.infrastructure.mq.kafka.consumer;
 
 
 import api.common.util.JsonUtil;
 import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
-import com.css.simulation.resource.scheduler.application.service.ProjectService;
+import com.css.simulation.resource.scheduler.application.service.ProjectApplicationService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
@@ -18,7 +18,7 @@ import javax.annotation.Resource;
 @Slf4j
 public class ProjectConsumer {
     @Resource
-    private ProjectService projectService;
+    private ProjectApplicationService projectApplicationService;
 
     /**
      * @param projectRecord 项目启动消息
@@ -28,7 +28,7 @@ public class ProjectConsumer {
     public void acceptMessage(ConsumerRecord<String, String> projectRecord) {
         log.info("接收到项目开始消息为：" + projectRecord);
         ProjectMessageModel projectMessageModel = JsonUtil.jsonToBean(projectRecord.value(), ProjectMessageModel.class);
-        projectService.runProject(projectMessageModel);
+        projectApplicationService.runProject(projectMessageModel);
     }
 
     //* -------------------------------- 结束 --------------------------------
@@ -41,7 +41,7 @@ public class ProjectConsumer {
         String projectId = jsonNode.path("projectId").asText();
         String projectType = jsonNode.path("type").asText();
 
-        projectService.stopProject(projectType, projectId);
+        projectApplicationService.stopProject(projectType, projectId);
     }
 
 

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

@@ -1,7 +0,0 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface AlgorithmExpandMapper {
-}

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/mysql/mapper/SimulationAutomaticProjectMapper.java

@@ -1,17 +0,0 @@
-package com.css.simulation.resource.scheduler.infrastructure.mysql.mapper;
-
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-@Mapper
-public interface SimulationAutomaticProjectMapper {
-     @Select("select vehicle\n" +
-             "from simulation_manual_project\n" +
-             "where id = #{id}")
-     String vehicleBySdId(String id);
-     @Select("select vehicle\n" +
-             "from simulation_automatic_project\n" +
-             "where id = #{id}")
-     String vehicleByZdId(String id);
-}

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.AlgorithmExpandMapper">
+
+
+    <update id="updateStatusByAlgorithmId">
+        update algorithm_expand
+        set status = #{status}
+        where algorithm_id = #{algorithmId}
+    </update>
+</mapper>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationAutomaticProjectMapper">
+
+
+    <select id="selectAlgorithmTypeById" resultType="java.lang.String">
+        select algorithm_type from simulation.simulation_automatic_project where id = #{id}
+    </select>
+    <select id="selectAlgorithmById" resultType="java.lang.String">
+        select algorithm from simulation.simulation_automatic_project where id = #{id}
+    </select>
+</mapper>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationAutomaticSubprojectMapper">
+
+    <select id="selectParentIdById" resultType="java.lang.String">
+        select parent_id from simulation.simulation_automatic_subproject
+        where id = #{id}
+    </select>
+</mapper>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.scheduler.infrastructure.db.mysql.mapper.SimulationManualProjectMapper">
+
+
+    <select id="selectAlgorithmTypeById" resultType="java.lang.String">
+        select algorithm_type from simulation_manual_project where id = #{id}
+    </select>
+    <select id="selectAlgorithmById" resultType="java.lang.String">
+        select algorithm from simulation_manual_project where id = #{id}
+    </select>
+</mapper>