算法平台算法添加进度字段

api-common/src/main/java/api/common/pojo/constants/DictConstants.java

@@ -3,6 +3,10 @@ package api.common.pojo.constants;
 @SuppressWarnings("all")
 public class DictConstants {
 
+    public static final String ALGORITHM_EXPAND_STATUS_NOT_TESTED = "1";
+    public static final String ALGORITHM_EXPAND_STATUS_TESTING = "2";
+    public static final String ALGORITHM_EXPAND_STATUS_TESTED = "3";
+
     public static final String PROJECT_RUN_TYPE_EXECUTE = "1";  // 等待执行
     public static final String PROJECT_RUN_TYPE_EXPAND = "2";  // 等待扩充
     public static final String PROJECT_WAIT_QUEUE_KEY = "project-wait-queue";  // 等待执行

api-common/src/main/java/api/common/util/JsonUtil.java

@@ -21,6 +21,30 @@ public class JsonUtil {
 
     private static final ObjectMapper mapper = new ObjectMapper();
 
+    /**
+     * 获取指定字段的值
+     *
+     * @param json     json 字符串
+     * @param location 定位字符串 xx.xx.xx，数组元素用数字选择
+     * @return 指定字段的值
+     */
+    public static String getString(String json, String location) {
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode jsonNode = objectMapper.readTree(json);
+            for (String element : location.split("\\.")) {
+                if (jsonNode.isArray()) {
+                    jsonNode = jsonNode.path(Integer.parseInt(element));
+                } else {
+                    jsonNode = jsonNode.path(element);
+                }
+            }
+            return jsonNode.asText();
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 
     /**
      * bean 转成 json
@@ -62,12 +86,16 @@ public class JsonUtil {
         return new ObjectMapper().writeValueAsString(list);
     }
 
-    public static <T> List<T> jsonToList(String json, Class<T> tClass) throws JsonProcessingException {
-        JavaType javaType = TypeFactory.defaultInstance().constructParametricType(List.class, tClass);
-        if (ObjectUtil.isNull(json)) {
-            return new ArrayList<>();
+    public static <T> List<T> jsonToList(String json, Class<T> tClass)  {
+        try {
+            JavaType javaType = TypeFactory.defaultInstance().constructParametricType(List.class, tClass);
+            if (ObjectUtil.isNull(json)) {
+                return new ArrayList<>();
+            }
+            return new ObjectMapper().readValue(json, javaType);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
         }
-        return new ObjectMapper().readValue(json, javaType);
     }
 
     /**

simulation-resource-common/pom.xml

@@ -17,6 +17,24 @@
     </properties>
 
     <dependencies>
+        <!-- 数据库 - 开始 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!-- 数据库 - 结束 -->
 
         <!-- apache kafka - 开始 -->
         <dependency>
@@ -134,4 +152,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/AlgorithmPlatformController.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/acl/algorithm/AlgorithmExpandAcl.java

@@ -1,24 +1,22 @@
-package com.css.simulation.resource.common.controller;
+package com.css.simulation.resource.common.acl.algorithm;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
 import api.common.util.HttpUtil;
 import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.configuration.algPlatform.ClientDetail;
+import com.css.simulation.resource.common.api.controller.RedisController;
+import com.css.simulation.resource.common.infrastructure.configuration.algPlatform.ClientDetail;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
-@RestController
-@RequestMapping("/algPlatform")
-public class AlgorithmPlatformController {
-
+@Service
+public class AlgorithmExpandAcl {
     private static final String TOKEN_KEY = "ALGPLATFORM:TOKEN";
 
     @Resource
@@ -27,7 +25,28 @@ public class AlgorithmPlatformController {
     @Resource
     private ClientDetail clientDetail;
 
-    @RequestMapping("/getAlgorithmList")
+    /**
+     * String urlParam = "";
+     * if (StringUtil.isNotEmpty(algorithmId)) {
+     * urlParam = urlParam + "&algorithmId=" + algorithmId;
+     * }
+     * if (StringUtil.isNotEmpty(algorithmName)) {
+     * urlParam = urlParam + "&algorithmName=" + algorithmName;
+     * }
+     * if (StringUtil.isNotEmpty(description)) {
+     * urlParam = urlParam + "&description=" + description;
+     * }
+     * if (StringUtil.isNotEmpty(page)) {
+     * urlParam = urlParam + "&page=" + page;
+     * }
+     * if (StringUtil.isNotEmpty(size)) {
+     * urlParam = urlParam + "&size=" + size;
+     * }
+     * urlParam = urlParam + "&sort=" + sort;
+     *
+     * @param param 参数
+     * @return 结果
+     */
     public ResponseBodyVO<String> getAlgorithmList(@RequestBody String param) {
         //取得token
         String token = getToken();
@@ -36,16 +55,17 @@ public class AlgorithmPlatformController {
         }
         String algorithmListUri = clientDetail.getAlgorithmListUri() + "?access_token=" + token + param;
         String result = HttpUtil.get(HttpUtil.getHttpClient(), HttpUtil.getRequestConfig(), algorithmListUri);
+
+
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "请求成功！", result);
     }
 
-    @RequestMapping("/selectAlgorithmNameByAlgorithmId")
     @SneakyThrows
     public ResponseBodyVO<String> selectAlgorithmNameByAlgorithmId(@RequestBody String algorithmId) {
         //取得token
         String token = getToken();
         if (ObjectUtil.isNull(token)) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "AlgPlatformCtrl--selectAlgorithmNameByAlgorithmId 获取算法平台token失败。");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "获取算法平台token失败。");
         }
         String algorithmListUri = clientDetail.getAlgorithmListUri()
                 + "?algorithmId=" + algorithmId

simulation-resource-common/src/main/java/com/css/simulation/resource/common/acl/entity/AlgorithmExpandAclEntity.java

@@ -0,0 +1,18 @@
+package com.css.simulation.resource.common.acl.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class AlgorithmExpandAclEntity {
+    private String id;
+    private String algorithmId;
+    private String algorithmName;
+    private String description;
+    private String algorithmType;
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/advice/AllExceptionHandlerAdvice.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/advice/AllExceptionHandlerAdvice.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.controller.advice;
+package com.css.simulation.resource.common.api.advice;
 
 import api.common.pojo.common.ResponseBodyVO;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/AlgorithmExpandController.java

@@ -0,0 +1,51 @@
+package com.css.simulation.resource.common.api.controller;
+
+import api.common.pojo.common.ResponseBodyVO;
+import com.css.simulation.resource.common.application.algorithm.AlgorithmExpandApplication;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/algPlatform")
+public class AlgorithmExpandController {
+
+    @Resource
+    private AlgorithmExpandApplication algorithmExpandApplication;
+
+
+    /**
+     * String urlParam = "";
+     * if (StringUtil.isNotEmpty(algorithmId)) {
+     * urlParam = urlParam + "&algorithmId=" + algorithmId;
+     * }
+     * if (StringUtil.isNotEmpty(algorithmName)) {
+     * urlParam = urlParam + "&algorithmName=" + algorithmName;
+     * }
+     * if (StringUtil.isNotEmpty(description)) {
+     * urlParam = urlParam + "&description=" + description;
+     * }
+     * if (StringUtil.isNotEmpty(page)) {
+     * urlParam = urlParam + "&page=" + page;
+     * }
+     * if (StringUtil.isNotEmpty(size)) {
+     * urlParam = urlParam + "&size=" + size;
+     * }
+     * urlParam = urlParam + "&sort=" + sort;
+     *
+     * @param param 参数
+     * @return 结果
+     */
+    @RequestMapping("/getAlgorithmList")
+    public ResponseBodyVO<String> getAlgorithmList(@RequestBody String param) {
+        return algorithmExpandApplication.getAlgorithmList(param);
+    }
+
+    @RequestMapping("/selectAlgorithmNameByAlgorithmId")
+    public ResponseBodyVO<String> selectAlgorithmNameByAlgorithmId(@RequestBody String algorithmId) {
+        return algorithmExpandApplication.selectAlgorithmNameByAlgorithmId(algorithmId);
+    }
+
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/ExcelController.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/ExcelController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.controller;
+package com.css.simulation.resource.common.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.util.ExcelUtil;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/KafkaController.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/KafkaController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.controller;
+package com.css.simulation.resource.common.api.controller;
 
 import api.common.pojo.param.KafkaParameter;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/MinioController.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/MinioController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.controller;
+package com.css.simulation.resource.common.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -6,9 +6,9 @@ import api.common.pojo.param.MinioParameter;
 import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.configuration.minio.MinioConfiguration;
-import com.css.simulation.resource.common.configuration.minio.SubMinioClient;
-import com.css.simulation.resource.common.util.MinioUtil;
+import com.css.simulation.resource.common.infrastructure.configuration.minio.MinioConfiguration;
+import com.css.simulation.resource.common.infrastructure.configuration.minio.SubMinioClient;
+import com.css.simulation.resource.common.infrastructure.util.MinioUtil;
 import io.minio.CreateMultipartUploadResponse;
 import io.minio.ListPartsResponse;
 import io.minio.errors.*;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/RedisController.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/api/controller/RedisController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.controller;
+package com.css.simulation.resource.common.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -107,4 +107,4 @@ public class RedisController {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map);
     }
 
-}
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/application/algorithm/AlgorithmExpandApplication.java

@@ -0,0 +1,56 @@
+package com.css.simulation.resource.common.application.algorithm;
+
+import api.common.pojo.common.ResponseBodyVO;
+import com.css.simulation.resource.common.acl.algorithm.AlgorithmExpandAcl;
+import com.css.simulation.resource.common.domain.algorithm.AlgorithmExpandDomain;
+import lombok.SneakyThrows;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.annotation.Resource;
+
+@Service
+public class AlgorithmExpandApplication {
+
+    @Resource
+    private AlgorithmExpandAcl algorithmExpandAcl;
+
+    @Resource
+    private AlgorithmExpandDomain algorithmExpandDomain;
+
+    /**
+     * String urlParam = "";
+     * if (StringUtil.isNotEmpty(algorithmId)) {
+     * urlParam = urlParam + "&algorithmId=" + algorithmId;
+     * }
+     * if (StringUtil.isNotEmpty(algorithmName)) {
+     * urlParam = urlParam + "&algorithmName=" + algorithmName;
+     * }
+     * if (StringUtil.isNotEmpty(description)) {
+     * urlParam = urlParam + "&description=" + description;
+     * }
+     * if (StringUtil.isNotEmpty(page)) {
+     * urlParam = urlParam + "&page=" + page;
+     * }
+     * if (StringUtil.isNotEmpty(size)) {
+     * urlParam = urlParam + "&size=" + size;
+     * }
+     * urlParam = urlParam + "&sort=" + sort;
+     *
+     * @param param 参数
+     * @return 结果
+     */
+    public ResponseBodyVO<String> getAlgorithmList(@RequestBody String param) {
+        //1 获取第三方算法平台列表
+        final ResponseBodyVO<String> algorithmList = algorithmExpandAcl.getAlgorithmList(param);
+        //2 检查仿真平台数据库中是否有该算法，没有则添加，同时设置状态为”未测试“
+        algorithmExpandDomain.checkIsExisted(algorithmList);
+        return algorithmList;
+    }
+
+    @SneakyThrows
+    public ResponseBodyVO<String> selectAlgorithmNameByAlgorithmId(@RequestBody String algorithmId) {
+        return algorithmExpandAcl.selectAlgorithmNameByAlgorithmId(algorithmId);
+    }
+
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/domain/algorithm/AlgorithmExpandDomain.java

@@ -0,0 +1,42 @@
+package com.css.simulation.resource.common.domain.algorithm;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.constants.DictConstants;
+import api.common.util.JsonUtil;
+import com.css.simulation.resource.common.acl.entity.AlgorithmExpandAclEntity;
+import com.css.simulation.resource.common.infrastructure.mysql.entity.AlgorithmExpandInfrastructureEntity;
+import com.css.simulation.resource.common.infrastructure.mysql.mapper.AlgorithmExpandMapper;
+import com.css.simulation.resource.common.infrastructure.mysql.param.AlgorithmExpandInfrastructureParam;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class AlgorithmExpandDomain {
+
+    @Resource
+    private AlgorithmExpandMapper algorithmExpandMapper;
+
+    public void checkIsExisted(ResponseBodyVO<String> algorithmBody) {
+        final String algorithmListResponseJson = algorithmBody.getInfo();
+        final String algorithmListJson = JsonUtil.getString(algorithmListResponseJson, "data.content");
+        final List<AlgorithmExpandAclEntity> algorithmExpandAclEntities = JsonUtil.jsonToList(algorithmListJson, AlgorithmExpandAclEntity.class);
+        //1 获取算法平台查询到的所有算法ID
+        final List<String> aclAlgorithmIds = algorithmExpandAclEntities.stream().map(AlgorithmExpandAclEntity::getAlgorithmId).collect(Collectors.toList());
+        final List<String> infrastructureAlgorithmIds = algorithmExpandMapper.selectAlgorithmIds(AlgorithmExpandInfrastructureParam.builder().algorithmIds(aclAlgorithmIds).build());
+        //2 不存在的数据插入数据库并设置状态为“未测试”
+        algorithmExpandAclEntities.forEach(algorithmExpandAclEntity->{
+            if(!infrastructureAlgorithmIds.contains(algorithmExpandAclEntity.getAlgorithmId())){
+                final AlgorithmExpandInfrastructureEntity algorithmExpandInfrastructureEntity = new AlgorithmExpandInfrastructureEntity();
+                BeanUtils.copyProperties(algorithmExpandAclEntity,algorithmExpandInfrastructureEntity);
+                algorithmExpandInfrastructureEntity.setStatus(DictConstants.ALGORITHM_EXPAND_STATUS_NOT_TESTED);
+                algorithmExpandMapper.insert(algorithmExpandInfrastructureEntity);
+            }
+        });
+    }
+
+
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/algPlatform/ClientDetail.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/algPlatform/ClientDetail.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.algPlatform;
+package com.css.simulation.resource.common.infrastructure.configuration.algPlatform;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/kafka/producer/ApacheKafkaPartitioner.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/kafka/producer/ApacheKafkaPartitioner.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.kafka.producer;
+package com.css.simulation.resource.common.infrastructure.configuration.kafka.producer;
 
 import org.apache.kafka.clients.producer.Partitioner;
 import org.apache.kafka.common.Cluster;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/minio/MinioConfiguration.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/minio/MinioConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.minio;
+package com.css.simulation.resource.common.infrastructure.configuration.minio;
 
 import io.minio.MinioClient;
 import lombok.Data;
@@ -35,4 +35,4 @@ public class MinioConfiguration {
         return new SubMinioClient(minioClient);
     }
 
-}
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/minio/SubMinioClient.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/minio/SubMinioClient.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.minio;
+package com.css.simulation.resource.common.infrastructure.configuration.minio;
 
 import com.google.common.collect.Multimap;
 import io.minio.CreateMultipartUploadResponse;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/oauth/MyTokenServices.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/oauth/MyTokenServices.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.oauth;
+package com.css.simulation.resource.common.infrastructure.configuration.oauth;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/oauth/OAuth2ResourceServerConfiguration.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/oauth/OAuth2ResourceServerConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.oauth;
+package com.css.simulation.resource.common.infrastructure.configuration.oauth;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/oauth/OauthParameter.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/oauth/OauthParameter.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.oauth;
+package com.css.simulation.resource.common.infrastructure.configuration.oauth;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/configuration/redis/RedisTemplateConfiguration.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/configuration/redis/RedisTemplateConfiguration.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.configuration.redis;
+package com.css.simulation.resource.common.infrastructure.configuration.redis;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/mysql/entity/AlgorithmExpandInfrastructureEntity.java

@@ -0,0 +1,19 @@
+package com.css.simulation.resource.common.infrastructure.mysql.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AlgorithmExpandInfrastructureEntity {
+    private String id;
+    private String algorithmId;
+    private String algorithmName;
+    private String description;
+    private String algorithmType;
+    private String status;
+}

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

@@ -0,0 +1,37 @@
+package com.css.simulation.resource.common.infrastructure.mysql.mapper;
+
+import com.css.simulation.resource.common.infrastructure.mysql.entity.AlgorithmExpandInfrastructureEntity;
+import com.css.simulation.resource.common.infrastructure.mysql.param.AlgorithmExpandInfrastructureParam;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AlgorithmExpandMapper {
+
+    @Select(" <script>" +
+            " select id, algorithm_id, algorithm_name, description, algorithm_type, status\n" +
+            " from algorithm_expand\n" +
+            " where algorithm_id in\n" +
+            "    <foreach item='item' collection='algorithmIds' separator=',' open='(' close=')'>\n" +
+            "      #{item}\n" +
+            "    </foreach>" +
+            "</script>")
+    List<AlgorithmExpandInfrastructureEntity> select(AlgorithmExpandInfrastructureParam algorithmExpandInfrastructureParam);
+
+    @Select(" <script>" +
+            " select  algorithm_id\n" +
+            " from algorithm_expand\n" +
+            " where algorithm_id in\n" +
+            "    <foreach item='item' collection='algorithmIds' separator=',' open='(' close=')'>\n" +
+            "      #{item}\n" +
+            "    </foreach>" +
+            "</script>")
+    List<String> selectAlgorithmIds(AlgorithmExpandInfrastructureParam algorithmExpandInfrastructureParam);
+
+    @Insert("insert into algorithm_expand(id, algorithm_id, algorithm_name, description, algorithm_type, status) \n" +
+            "    value (#{id}, #{algorithmId}, #{algorithmName}, #{description}, #{algorithmType}, #{status})\n")
+    void insert(AlgorithmExpandInfrastructureEntity algorithmExpandInfrastructureEntity);
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/mysql/param/AlgorithmExpandInfrastructureParam.java

@@ -0,0 +1,22 @@
+package com.css.simulation.resource.common.infrastructure.mysql.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AlgorithmExpandInfrastructureParam {
+    private List<String> algorithmIds;
+    private String id;
+    private String algorithmId;
+    private String algorithmName;
+    private String description;
+    private String algorithmType;
+    private String status;
+}

simulation-resource-common/src/main/java/com/css/simulation/resource/common/util/MinioUtil.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/util/MinioUtil.java

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

simulation-resource-common/src/main/java/com/css/simulation/resource/common/util/processbar/ProgressInputStream.java → simulation-resource-common/src/main/java/com/css/simulation/resource/common/infrastructure/util/ProgressInputStream.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.common.util.processbar;
+package com.css.simulation.resource.common.infrastructure.util;
 
 
 import java.io.BufferedInputStream;

simulation-resource-monitor/src/main/java/com/css/simulation/resource/monitor/mappper/AlgorithmExpandMapper.java

@@ -0,0 +1,7 @@
+package com.css.simulation.resource.monitor.mappper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public class AlgorithmExpandMapper {
+}

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

@@ -0,0 +1,9 @@
+package com.css.simulation.resource.monitor.scheduler;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Component
+@Slf4j
+public class AlgorithmExpandScheduler {
+}

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

@@ -22,7 +22,7 @@ import java.util.concurrent.ScheduledFuture;
 public class ProjectScheduler implements SchedulingConfigurer {
 
     @Resource
-    ProjectService projectService;
+    private ProjectService projectService;
 
     static ProjectService staticProjectService;
 

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

@@ -308,7 +308,6 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 simulationProjectMapper.updateIdAndDetailsAndNowRunStateById(oldProjectId, newProjectId, projectDetailsVOJson, DictConstants.PROJECT_RUNNING);
                 projectRunToKafka(oldProjectPO);
             } else if (DictConstants.PROJECT_WAITING.equals(oldState)) { // 启动已保存的新项目
-                log.info("启动已保存的新项目");
                 String projectDetailsVOJson = JsonUtil.beanToJson(projectDetailsVO);
                 simulationProjectMapper.updateDetailsAndNowRunStateById(oldProjectId, projectDetailsVOJson, DictConstants.PROJECT_RUNNING);
                 projectRunToKafka(oldProjectPO);
@@ -1560,10 +1559,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         List<DropDownVo> algorithmList = new ArrayList<>();
 
-        ResponseBodyVO algorithmBody = algoPlatformService.getAlgorithmList(query);
+        ResponseBodyVO<String> algorithmBody = algoPlatformService.getAlgorithmList(query);
 
         // 解析数据
-        Map jsonMap = JsonUtil.jsonToMap((String) algorithmBody.getInfo());
+        Map jsonMap = JsonUtil.jsonToMap(algorithmBody.getInfo());
         Map<String, Object> dataMap = (Map<String, Object>) jsonMap.get("data");
         List<Map<String, String>> contentList = (List<Map<String, String>>) dataMap.get("content");
         Integer totalElements = (Integer) dataMap.get("totalElements");