|
@@ -5,21 +5,21 @@ import api.common.pojo.constants.DictConstants;
|
|
|
import api.common.util.*;
|
|
|
import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
|
|
|
import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
|
|
|
-import com.css.simulation.resource.scheduler.infrastructure.configuration.custom.CustomConfiguration;
|
|
|
-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.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.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
|
|
|
+import com.css.simulation.resource.scheduler.infra.configuration.entity.NodeEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesConfiguration;
|
|
|
+import com.css.simulation.resource.scheduler.infra.configuration.minio.MinioConfiguration;
|
|
|
+import com.css.simulation.resource.scheduler.infra.db.entity.AlgorithmExpandEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationAutomaticProjectEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationAutomaticSubprojectEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.db.entity.SimulationManualProjectEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.db.mysql.mapper.*;
|
|
|
+import com.css.simulation.resource.scheduler.infra.entity.PrefixEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.entity.ProjectEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.entity.UserEntity;
|
|
|
+import com.css.simulation.resource.scheduler.infra.configuration.kubernetes.KubernetesUtil;
|
|
|
+import com.css.simulation.resource.scheduler.infra.db.redis.CustomRedisClient;
|
|
|
+import com.css.simulation.resource.scheduler.infra.db.redis.RedisUtil;
|
|
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@@ -204,11 +204,11 @@ public class ProjectDomainService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- public List<com.css.simulation.resource.scheduler.infrastructure.entity.NodeEntity> getNodeListToCount(Map<String, Integer> nodeMap) {
|
|
|
- List<com.css.simulation.resource.scheduler.infrastructure.entity.NodeEntity> result = new ArrayList<>();
|
|
|
+ public List<com.css.simulation.resource.scheduler.infra.entity.NodeEntity> getNodeListToCount(Map<String, Integer> nodeMap) {
|
|
|
+ List<com.css.simulation.resource.scheduler.infra.entity.NodeEntity> result = new ArrayList<>();
|
|
|
nodeMap.forEach((nodeName, parallelism) -> {
|
|
|
for (int i = 0; i < parallelism; i++) {
|
|
|
- result.add(new com.css.simulation.resource.scheduler.infrastructure.entity.NodeEntity(nodeName, 0));
|
|
|
+ result.add(new com.css.simulation.resource.scheduler.infra.entity.NodeEntity(nodeName, 0));
|
|
|
}
|
|
|
});
|
|
|
return result;
|