root 2 years ago
parent
commit
8b3fe03f2e

+ 26 - 28
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/ProjectService.java

@@ -12,12 +12,10 @@ import com.css.simulation.resource.scheduler.dao.mapper.IndexTemplateMapper;
 import com.css.simulation.resource.scheduler.dao.mapper.SceneMapper;
 import com.css.simulation.resource.scheduler.dao.mapper.SceneMapper;
 import com.css.simulation.resource.scheduler.dao.mapper.TaskMapper;
 import com.css.simulation.resource.scheduler.dao.mapper.TaskMapper;
 import com.css.simulation.resource.scheduler.dao.manager.ProjectManager;
 import com.css.simulation.resource.scheduler.dao.manager.ProjectManager;
-import com.css.simulation.resource.scheduler.mapper.*;
 import com.css.simulation.resource.scheduler.dao.entity.AlgorithmPO;
 import com.css.simulation.resource.scheduler.dao.entity.AlgorithmPO;
 import com.css.simulation.resource.scheduler.dao.entity.IndexTemplatePO;
 import com.css.simulation.resource.scheduler.dao.entity.IndexTemplatePO;
 import com.css.simulation.resource.scheduler.dao.entity.ScenePO;
 import com.css.simulation.resource.scheduler.dao.entity.ScenePO;
 import com.css.simulation.resource.scheduler.service.domain.PrefixTO;
 import com.css.simulation.resource.scheduler.service.domain.PrefixTO;
-import com.css.simulation.resource.scheduler.util.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;
 import io.minio.MinioClient;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
@@ -50,58 +48,58 @@ public class ProjectService {
      */
      */
 
 
     @Value("${algorithm-platform.appid}")
     @Value("${algorithm-platform.appid}")
-    String algorithmPlatformAppid;
+    private String algorithmPlatformAppid;
     @Value("${algorithm-platform.secret}")
     @Value("${algorithm-platform.secret}")
-    String algorithmPlatformSecret;
+    private String algorithmPlatformSecret;
     @Value("${algorithm-platform.token-uri}")
     @Value("${algorithm-platform.token-uri}")
-    String algorithmPlatformTokenUri;
+    private String algorithmPlatformTokenUri;
     @Value("${algorithm-platform.algorithm-addr-uri}")
     @Value("${algorithm-platform.algorithm-addr-uri}")
-    String algorithmPlatformAlgorithmAddrUri;
+    private String algorithmPlatformAlgorithmAddrUri;
     @Value("${scheduler.minio-path.project-result}")
     @Value("${scheduler.minio-path.project-result}")
-    String projectResultPathOfMinio;
+    private String projectResultPathOfMinio;
     @Value("${scheduler.linux-path.temp}")
     @Value("${scheduler.linux-path.temp}")
-    String linuxTempPath;
+    private String linuxTempPath;
     @Value("${scheduler.linux-path.pod-template-yaml}")
     @Value("${scheduler.linux-path.pod-template-yaml}")
-    String podTemplateYaml;
+    private String podTemplateYaml;
     @Value("${scheduler.linux-path.pod-yaml-directory}")
     @Value("${scheduler.linux-path.pod-yaml-directory}")
-    String podYamlDirectory;
+    private String podYamlDirectory;
     @Value("${minio.bucket-name}")
     @Value("${minio.bucket-name}")
-    String bucketName;
+    private String bucketName;
     @Value("${scheduler.host.hostname}")
     @Value("${scheduler.host.hostname}")
-    String hostname;
+    private String hostname;
     @Value("${scheduler.host.username}")
     @Value("${scheduler.host.username}")
-    String username;
+    private String username;
     @Value("${scheduler.host.password}")
     @Value("${scheduler.host.password}")
-    String password;
+    private String password;
 
 
     @Resource
     @Resource
-    StringRedisTemplate stringRedisTemplate;
+    private StringRedisTemplate stringRedisTemplate;
     @Resource(name = "myKafkaAdmin")
     @Resource(name = "myKafkaAdmin")
-    Admin kafkaAdminClient;
+    private Admin kafkaAdminClient;
     @Resource
     @Resource
-    CloseableHttpClient closeableHttpClient;
+    private CloseableHttpClient closeableHttpClient;
     @Resource
     @Resource
-    RequestConfig requestConfig;
+    private RequestConfig requestConfig;
     @Resource
     @Resource
-    MinioClient minioClient;
+    private MinioClient minioClient;
     @Resource
     @Resource
-    TaskMapper taskMapper;
+    private TaskMapper taskMapper;
     @Resource
     @Resource
-    IndexTemplateMapper indexTemplateMapper;
+    private IndexTemplateMapper indexTemplateMapper;
     @Resource
     @Resource
-    SceneMapper sceneMapper;
+    private SceneMapper sceneMapper;
     @Resource
     @Resource
-    AlgorithmMapper algorithmMapper;
+    private AlgorithmMapper algorithmMapper;
     @Resource
     @Resource
-    ProjectUtil projectUtil;
+    private ProjectUtil projectUtil;
     @Resource
     @Resource
-    DockerConfiguration dockerConfiguration;
+    private DockerConfiguration dockerConfiguration;
     @Resource
     @Resource
-    KubernetesConfiguration kubernetesConfiguration;
+    private KubernetesConfiguration kubernetesConfiguration;
     @Resource
     @Resource
-    GitConfiguration gitConfiguration;
+    private GitConfiguration gitConfiguration;
     @Resource
     @Resource
-    ProjectManager projectManager;
+    private ProjectManager projectManager;
 
 
 
 
     // -------------------------------- Comment --------------------------------
     // -------------------------------- Comment --------------------------------

+ 4 - 8
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/web/consumer/ProjectConsumer.java

@@ -4,19 +4,15 @@ package com.css.simulation.resource.scheduler.web.consumer;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.dto.ProjectMessageDTO;
 import api.common.pojo.dto.ProjectMessageDTO;
 import api.common.util.*;
 import api.common.util.*;
+import com.css.simulation.resource.scheduler.common.util.ApacheKafkaUtil;
+import com.css.simulation.resource.scheduler.common.util.MinioUtil;
+import com.css.simulation.resource.scheduler.common.util.ProjectUtil;
 import com.css.simulation.resource.scheduler.dao.entity.*;
 import com.css.simulation.resource.scheduler.dao.entity.*;
-import com.css.simulation.resource.scheduler.dao.mapper.*;
-import com.css.simulation.resource.scheduler.entity.*;
 import com.css.simulation.resource.scheduler.dao.manager.ProjectManager;
 import com.css.simulation.resource.scheduler.dao.manager.ProjectManager;
 import com.css.simulation.resource.scheduler.dao.manager.TaskManager;
 import com.css.simulation.resource.scheduler.dao.manager.TaskManager;
-import com.css.simulation.resource.scheduler.mapper.*;
-import com.css.simulation.resource.scheduler.pojo.entity.*;
-import com.css.simulation.resource.scheduler.pojo.domain.*;
+import com.css.simulation.resource.scheduler.dao.mapper.*;
 import com.css.simulation.resource.scheduler.service.ProjectService;
 import com.css.simulation.resource.scheduler.service.ProjectService;
 import com.css.simulation.resource.scheduler.service.domain.*;
 import com.css.simulation.resource.scheduler.service.domain.*;
-import com.css.simulation.resource.scheduler.common.util.ApacheKafkaUtil;
-import com.css.simulation.resource.scheduler.common.util.MinioUtil;
-import com.css.simulation.resource.scheduler.common.util.ProjectUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;
 import io.minio.MinioClient;