mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/configuration/docker/DockerConfiguration.java

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.scheduler.common.configuration.docker;
 
-import com.css.simulation.resource.scheduler.pojo.to.DockerNodeTO;
+import com.css.simulation.resource.scheduler.service.domain.DockerNodeTO;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/configuration/kubernetes/KubernetesConfiguration.java

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.scheduler.common.configuration.kubernetes;
 
-import com.css.simulation.resource.scheduler.pojo.to.KubernetesNodeTO;
+import com.css.simulation.resource.scheduler.service.domain.KubernetesNodeTO;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.util.ClientBuilder;
 import io.kubernetes.client.util.KubeConfig;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/resource/TaskLock.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/resource/TaskLock.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.scheduler.resource;
+package com.css.simulation.resource.scheduler.common.resource;
 
 import api.common.pojo.dto.ProjectMessageDTO;
 import api.common.util.JsonUtil;
-import com.css.simulation.resource.scheduler.pojo.to.PrefixTO;
-import com.css.simulation.resource.scheduler.util.ProjectUtil;
+import com.css.simulation.resource.scheduler.service.domain.PrefixTO;
+import com.css.simulation.resource.scheduler.common.util.ProjectUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/scheduler/AlgorithmScheduler.java

@@ -2,9 +2,9 @@ package com.css.simulation.resource.scheduler.common.scheduler;
 
 import api.common.util.SshUtil;
 import com.css.simulation.resource.scheduler.common.configuration.docker.DockerConfiguration;
-import com.css.simulation.resource.scheduler.mapper.AlgorithmMapper;
-import com.css.simulation.resource.scheduler.pojo.po.AlgorithmPO;
-import com.css.simulation.resource.scheduler.pojo.to.DockerNodeTO;
+import com.css.simulation.resource.scheduler.dao.mapper.AlgorithmMapper;
+import com.css.simulation.resource.scheduler.dao.entity.AlgorithmPO;
+import com.css.simulation.resource.scheduler.service.domain.DockerNodeTO;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.sshd.client.SshClient;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/scheduler/ClusterScheduler.java

@@ -3,12 +3,12 @@ package com.css.simulation.resource.scheduler.common.scheduler;
 import api.common.pojo.constants.DictConstants;
 import api.common.util.CollectionUtil;
 import com.css.simulation.resource.scheduler.common.configuration.kubernetes.KubernetesConfiguration;
-import com.css.simulation.resource.scheduler.mapper.AutoSubProjectMapper;
-import com.css.simulation.resource.scheduler.mapper.ManualProjectMapper;
-import com.css.simulation.resource.scheduler.pojo.po.ProjectPO;
-import com.css.simulation.resource.scheduler.pojo.to.KubernetesNodeTO;
-import com.css.simulation.resource.scheduler.util.KubernetesUtil;
-import com.css.simulation.resource.scheduler.util.RedisUtil;
+import com.css.simulation.resource.scheduler.dao.mapper.AutoSubProjectMapper;
+import com.css.simulation.resource.scheduler.dao.mapper.ManualProjectMapper;
+import com.css.simulation.resource.scheduler.dao.entity.ProjectPO;
+import com.css.simulation.resource.scheduler.service.domain.KubernetesNodeTO;
+import com.css.simulation.resource.scheduler.common.util.KubernetesUtil;
+import com.css.simulation.resource.scheduler.common.util.RedisUtil;
 import io.kubernetes.client.openapi.ApiClient;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/ApacheKafkaUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/util/ApacheKafkaUtil.java

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/GitUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/util/GitUtil.java

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/KubernetesUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/util/KubernetesUtil.java

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

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

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/ProjectUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/util/ProjectUtil.java

@@ -1,15 +1,18 @@
-package com.css.simulation.resource.scheduler.util;
+package com.css.simulation.resource.scheduler.common.util;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.dto.ProjectMessageDTO;
 import api.common.util.*;
 import com.css.simulation.resource.scheduler.common.configuration.kubernetes.KubernetesConfiguration;
-import com.css.simulation.resource.scheduler.mapper.*;
-import com.css.simulation.resource.scheduler.pojo.po.ProjectPO;
-import com.css.simulation.resource.scheduler.pojo.po.UserPO;
-import com.css.simulation.resource.scheduler.pojo.to.KubernetesNodeTO;
-import com.css.simulation.resource.scheduler.pojo.to.NodeTO;
-import com.css.simulation.resource.scheduler.pojo.to.PrefixTO;
+import com.css.simulation.resource.scheduler.dao.entity.ProjectPO;
+import com.css.simulation.resource.scheduler.dao.entity.UserPO;
+import com.css.simulation.resource.scheduler.dao.mapper.AutoSubProjectMapper;
+import com.css.simulation.resource.scheduler.dao.mapper.ClusterMapper;
+import com.css.simulation.resource.scheduler.dao.mapper.ManualProjectMapper;
+import com.css.simulation.resource.scheduler.dao.mapper.UserMapper;
+import com.css.simulation.resource.scheduler.service.domain.KubernetesNodeTO;
+import com.css.simulation.resource.scheduler.service.domain.NodeTO;
+import com.css.simulation.resource.scheduler.service.domain.PrefixTO;
 import io.kubernetes.client.openapi.ApiClient;
 import lombok.SneakyThrows;
 import lombok.Synchronized;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/RedisUtil.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/common/util/RedisUtil.java

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/AlgorithmPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/AlgorithmPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/CameraPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/CameraPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/ClusterPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/ClusterPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/IndexTemplatePO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/IndexTemplatePO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/LeafIndexPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/LeafIndexPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import api.common.pojo.common.CommonPO;
 import lombok.*;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/OgtPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/OgtPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/ProjectPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/ProjectPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/ScenePO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/ScenePO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/TaskPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/TaskPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import api.common.pojo.common.CommonPO;
 import lombok.*;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/UserPO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/UserPO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/po/VehiclePO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/entity/VehiclePO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.po;
+package com.css.simulation.resource.scheduler.dao.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/ProjectManager.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/manager/ProjectManager.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.scheduler.manager;
+package com.css.simulation.resource.scheduler.dao.manager;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.FileUtil;
 import com.css.simulation.resource.scheduler.common.configuration.kubernetes.KubernetesConfiguration;
 import com.css.simulation.resource.scheduler.common.configuration.minio.MinioConfiguration;
-import com.css.simulation.resource.scheduler.mapper.VehicleMapper;
-import com.css.simulation.resource.scheduler.util.ProjectUtil;
+import com.css.simulation.resource.scheduler.dao.mapper.VehicleMapper;
+import com.css.simulation.resource.scheduler.common.util.ProjectUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskIndexManager.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/manager/TaskIndexManager.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.manager;
+package com.css.simulation.resource.scheduler.dao.manager;
 
-import com.css.simulation.resource.scheduler.mapper.IndexMapper;
-import com.css.simulation.resource.scheduler.pojo.po.LeafIndexPO;
+import com.css.simulation.resource.scheduler.dao.mapper.IndexMapper;
+import com.css.simulation.resource.scheduler.dao.entity.LeafIndexPO;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskManager.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/manager/TaskManager.java

@@ -1,20 +1,21 @@
-package com.css.simulation.resource.scheduler.manager;
+package com.css.simulation.resource.scheduler.dao.manager;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
-import com.css.simulation.resource.scheduler.feign.VideoService;
+import com.css.simulation.resource.scheduler.dao.mapper.*;
+import com.css.simulation.resource.scheduler.service.feign.VideoService;
 import com.css.simulation.resource.scheduler.mapper.*;
-import com.css.simulation.resource.scheduler.pojo.po.IndexTemplatePO;
-import com.css.simulation.resource.scheduler.pojo.po.LeafIndexPO;
-import com.css.simulation.resource.scheduler.pojo.po.ProjectPO;
-import com.css.simulation.resource.scheduler.pojo.po.TaskPO;
-import com.css.simulation.resource.scheduler.pojo.to.PrefixTO;
-import com.css.simulation.resource.scheduler.pojo.to.ScoreTO;
-import com.css.simulation.resource.scheduler.resource.TaskLock;
-import com.css.simulation.resource.scheduler.util.MinioUtil;
-import com.css.simulation.resource.scheduler.util.ProjectUtil;
-import com.css.simulation.resource.scheduler.util.RedisUtil;
+import com.css.simulation.resource.scheduler.dao.entity.IndexTemplatePO;
+import com.css.simulation.resource.scheduler.dao.entity.LeafIndexPO;
+import com.css.simulation.resource.scheduler.dao.entity.ProjectPO;
+import com.css.simulation.resource.scheduler.dao.entity.TaskPO;
+import com.css.simulation.resource.scheduler.service.domain.PrefixTO;
+import com.css.simulation.resource.scheduler.service.domain.ScoreTO;
+import com.css.simulation.resource.scheduler.common.resource.TaskLock;
+import com.css.simulation.resource.scheduler.common.util.MinioUtil;
+import com.css.simulation.resource.scheduler.common.util.ProjectUtil;
+import com.css.simulation.resource.scheduler.common.util.RedisUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/AlgorithmMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/AlgorithmMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.AlgorithmPO;
+import com.css.simulation.resource.scheduler.dao.entity.AlgorithmPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/AutoSubProjectMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/AutoSubProjectMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.ProjectPO;
+import com.css.simulation.resource.scheduler.dao.entity.ProjectPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/ClusterMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/ClusterMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.ClusterPO;
+import com.css.simulation.resource.scheduler.dao.entity.ClusterPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/ConfigMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/ConfigMapper.java

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/IndexMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/IndexMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.LeafIndexPO;
+import com.css.simulation.resource.scheduler.dao.entity.LeafIndexPO;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/IndexTemplateMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/IndexTemplateMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.IndexTemplatePO;
+import com.css.simulation.resource.scheduler.dao.entity.IndexTemplatePO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/ManualProjectMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/ManualProjectMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.ProjectPO;
+import com.css.simulation.resource.scheduler.dao.entity.ProjectPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/SceneMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/SceneMapper.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.IndexTemplatePO;
-import com.css.simulation.resource.scheduler.pojo.po.ScenePO;
+import com.css.simulation.resource.scheduler.dao.entity.IndexTemplatePO;
+import com.css.simulation.resource.scheduler.dao.entity.ScenePO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/ScoringRulesMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/ScoringRulesMapper.java

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/SensorCameraMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/SensorCameraMapper.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
-import com.css.simulation.resource.scheduler.pojo.po.CameraPO;
+import com.css.simulation.resource.scheduler.dao.entity.CameraPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/SensorOgtMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/SensorOgtMapper.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
-import com.css.simulation.resource.scheduler.pojo.po.OgtPO;
+import com.css.simulation.resource.scheduler.dao.entity.OgtPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/SimulationAutomaticProjectMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/SimulationAutomaticProjectMapper.java

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/TaskMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/TaskMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.TaskPO;
+import com.css.simulation.resource.scheduler.dao.entity.TaskPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/UserMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/UserMapper.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
 
-import com.css.simulation.resource.scheduler.pojo.po.UserPO;
+import com.css.simulation.resource.scheduler.dao.entity.UserPO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/VehicleMapper.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/dao/mapper/VehicleMapper.java

@@ -1,6 +1,6 @@
-package com.css.simulation.resource.scheduler.mapper;
+package com.css.simulation.resource.scheduler.dao.mapper;
 
-import com.css.simulation.resource.scheduler.pojo.po.VehiclePO;
+import com.css.simulation.resource.scheduler.dao.entity.VehiclePO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 

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

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.util.FileUtil;
-import com.css.simulation.resource.scheduler.util.MinioUtil;
+import com.css.simulation.resource.scheduler.common.util.MinioUtil;
 import io.minio.MinioClient;
 import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -6,12 +6,17 @@ import api.common.util.*;
 import com.css.simulation.resource.scheduler.common.configuration.docker.DockerConfiguration;
 import com.css.simulation.resource.scheduler.common.configuration.git.GitConfiguration;
 import com.css.simulation.resource.scheduler.common.configuration.kubernetes.KubernetesConfiguration;
-import com.css.simulation.resource.scheduler.manager.ProjectManager;
+import com.css.simulation.resource.scheduler.common.util.*;
+import com.css.simulation.resource.scheduler.dao.mapper.AlgorithmMapper;
+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.TaskMapper;
+import com.css.simulation.resource.scheduler.dao.manager.ProjectManager;
 import com.css.simulation.resource.scheduler.mapper.*;
-import com.css.simulation.resource.scheduler.pojo.po.AlgorithmPO;
-import com.css.simulation.resource.scheduler.pojo.po.IndexTemplatePO;
-import com.css.simulation.resource.scheduler.pojo.po.ScenePO;
-import com.css.simulation.resource.scheduler.pojo.to.PrefixTO;
+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.ScenePO;
+import com.css.simulation.resource.scheduler.service.domain.PrefixTO;
 import com.css.simulation.resource.scheduler.util.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.minio.MinioClient;

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

@@ -1,12 +1,12 @@
 package com.css.simulation.resource.scheduler.service;
 
 import api.common.util.SshUtil;
-import com.css.simulation.resource.scheduler.manager.TaskManager;
-import com.css.simulation.resource.scheduler.mapper.TaskMapper;
-import com.css.simulation.resource.scheduler.pojo.po.ProjectPO;
-import com.css.simulation.resource.scheduler.pojo.po.TaskPO;
-import com.css.simulation.resource.scheduler.pojo.to.PrefixTO;
-import com.css.simulation.resource.scheduler.util.ProjectUtil;
+import com.css.simulation.resource.scheduler.dao.manager.TaskManager;
+import com.css.simulation.resource.scheduler.dao.mapper.TaskMapper;
+import com.css.simulation.resource.scheduler.dao.entity.ProjectPO;
+import com.css.simulation.resource.scheduler.dao.entity.TaskPO;
+import com.css.simulation.resource.scheduler.service.domain.PrefixTO;
+import com.css.simulation.resource.scheduler.common.util.ProjectUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.sshd.client.SshClient;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/DockerNodeTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/DockerNodeTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/DynamicsTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/DynamicsTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/InfoTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/InfoTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/KubernetesNodeTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/KubernetesNodeTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/ModelTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/ModelTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/NodeTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/NodeTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/PartitionTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/PartitionTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 
 import lombok.AllArgsConstructor;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/PrefixTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/PrefixTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 
 import lombok.AllArgsConstructor;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/ScenarioTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/ScenarioTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/ScoreTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/ScoreTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/SensorsTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/SensorsTO.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
-import com.css.simulation.resource.scheduler.pojo.po.CameraPO;
-import com.css.simulation.resource.scheduler.pojo.po.OgtPO;
+import com.css.simulation.resource.scheduler.dao.entity.CameraPO;
+import com.css.simulation.resource.scheduler.dao.entity.OgtPO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/TaskTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/TaskTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/pojo/to/VehicleTO.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/domain/VehicleTO.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.pojo.to;
+package com.css.simulation.resource.scheduler.service.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/feign/VideoService.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/feign/VideoService.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.feign;
+package com.css.simulation.resource.scheduler.service.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.feign.fallback.VideoServiceFallBack;
+import com.css.simulation.resource.scheduler.service.feign.fallback.VideoServiceFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/feign/fallback/VideoServiceFallBack.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/feign/fallback/VideoServiceFallBack.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.scheduler.feign.fallback;
+package com.css.simulation.resource.scheduler.service.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.scheduler.feign.VideoService;
+import com.css.simulation.resource.scheduler.service.feign.VideoService;
 
 
 public class VideoServiceFallBack implements VideoService {

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ProjectConsumer.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/web/consumer/ProjectConsumer.java

@@ -1,18 +1,22 @@
-package com.css.simulation.resource.scheduler.consumer;
+package com.css.simulation.resource.scheduler.web.consumer;
 
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.dto.ProjectMessageDTO;
 import api.common.util.*;
-import com.css.simulation.resource.scheduler.manager.ProjectManager;
-import com.css.simulation.resource.scheduler.manager.TaskManager;
+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.TaskManager;
 import com.css.simulation.resource.scheduler.mapper.*;
-import com.css.simulation.resource.scheduler.pojo.po.*;
-import com.css.simulation.resource.scheduler.pojo.to.*;
+import com.css.simulation.resource.scheduler.pojo.entity.*;
+import com.css.simulation.resource.scheduler.pojo.domain.*;
 import com.css.simulation.resource.scheduler.service.ProjectService;
-import com.css.simulation.resource.scheduler.util.ApacheKafkaUtil;
-import com.css.simulation.resource.scheduler.util.MinioUtil;
-import com.css.simulation.resource.scheduler.util.ProjectUtil;
+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.ObjectMapper;
 import io.minio.MinioClient;

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

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

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.controller;
+package com.css.simulation.resource.scheduler.web.controller;
 
 
 import com.css.simulation.resource.scheduler.service.TaskService;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/controller/advice/AllExceptionHandlerAdvice.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/web/controller/advice/AllExceptionHandlerAdvice.java

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