算法平台

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

@@ -39,7 +39,8 @@ public class JsonUtil {
                     jsonNode = jsonNode.path(element);
                 }
             }
-            return jsonNode.asText();
+            //此处需使用toString，asText只能在最后一级使用，否则值为null
+            return jsonNode.toString();
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }

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

@@ -2,11 +2,13 @@ package com.css.simulation.resource.common.domain.algorithm;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
+import api.common.util.CollectionUtil;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -14,6 +16,7 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class AlgorithmExpandDomain {
 
@@ -22,20 +25,26 @@ public class AlgorithmExpandDomain {
 
     public void checkIsExisted(ResponseBodyVO<String> algorithmBody) {
         final String algorithmListResponseJson = algorithmBody.getInfo();
+        log.info("算法平台请求结果为：{}", algorithmListResponseJson);
         final String algorithmListJson = JsonUtil.getString(algorithmListResponseJson, "data.content");
+        log.info("算法平台的算法列表JSON为：{}", algorithmListJson);
         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);
-            }
-        });
+        log.info("算法平台的算法列表为：{}", algorithmExpandAclEntities);
+        if (CollectionUtil.isNotEmpty(algorithmExpandAclEntities)) {
+            //1 获取算法平台查询到的所有算法ID
+            final List<String> aclAlgorithmIds = algorithmExpandAclEntities.stream().map(AlgorithmExpandAclEntity::getAlgorithmId).collect(Collectors.toList());
+            log.info("算法平台的算法ID列表为：{}", aclAlgorithmIds);
+            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-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/ProjectDomainService.java

@@ -893,15 +893,11 @@ public class ProjectDomainService {
     }
 
     public List<ProjectWaitQueueEntity> getWaitQueue() {
-        try {
-            final String waitQueueJson = customRedisClient.get(DictConstants.PROJECT_WAIT_QUEUE_KEY);
-            if (StringUtil.isNotEmpty(waitQueueJson)) {
-                return JsonUtil.jsonToList(waitQueueJson, ProjectWaitQueueEntity.class);
-            } else {
-                return null;
-            }
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
+        final String waitQueueJson = customRedisClient.get(DictConstants.PROJECT_WAIT_QUEUE_KEY);
+        if (StringUtil.isNotEmpty(waitQueueJson)) {
+            return JsonUtil.jsonToList(waitQueueJson, ProjectWaitQueueEntity.class);
+        } else {
+            return null;
         }
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/common/advice/ExceptionHandlerControllerAdvice.java

@@ -1,64 +0,0 @@
-package com.css.simulation.resource.common.advice;
-
-import api.common.pojo.common.ResponseBodyVO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import java.util.Objects;
-
-@RestControllerAdvice
-@Slf4j
-public class ExceptionHandlerControllerAdvice {
-    /**
-     * 方法参数校验
-     */
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseBodyVO<Object> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
-        log.error(e.getMessage(), e);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage());
-    }
-
-    /**
-     * 请求体缺失异常统一处理
-     */
-    @ExceptionHandler(HttpMessageNotReadableException.class)
-    public ResponseBodyVO<Object> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
-        log.error(e.getMessage(), e);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "Required request body is missing！");
-    }
-
-
-    /**
-     * 权限校验异常统一处理
-     */
-    @ExceptionHandler(AccessDeniedException.class)
-    public ResponseBodyVO<Object> handleAccessDeniedException(AccessDeniedException e) {
-        log.error(e.getMessage(), e);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "Access is denied！");
-    }
-
-    /**
-     * 权限校验异常统一处理
-     */
-    @ExceptionHandler(RuntimeException.class)
-    public ResponseBodyVO<Object> handleRuntimeException(RuntimeException e) {
-        log.error(e.getMessage(), e);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, e.getMessage());
-    }
-
-    /**
-     * 服务器错误异常统一处理
-     */
-    @ExceptionHandler(Exception.class)
-    @ResponseBody
-    public ResponseBodyVO<Object> handleException(Exception e) {
-        log.error(e.getMessage(), e);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "服务器错误！");
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/FeignConfiguration.java

@@ -1,39 +0,0 @@
-package com.css.simulation.resource.common.configuration;
-
-import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.oauth.AuthorizationHolder;
-import feign.Logger;
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 转发 token
- */
-@Configuration
-public class FeignConfiguration implements RequestInterceptor {
-
-    @Bean
-    public Logger.Level feignLoggerLevel() {
-        return Logger.Level.FULL;
-    }
-
-    @Override
-    public void apply(RequestTemplate requestTemplate) {
-        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        String authorization = "";
-        if(ObjectUtil.isNull(attributes)){
-            authorization = AuthorizationHolder.getAuthorization();
-            AuthorizationHolder.remove();
-        }else{
-            HttpServletRequest request = attributes.getRequest();
-            authorization = request.getHeader("Authorization");
-        }
-        requestTemplate.header("Authorization", authorization);
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/OAuth2Configuration.java

@@ -1,55 +0,0 @@
-package com.css.simulation.resource.common.configuration;
-
-import com.css.simulation.resource.common.oauth.MyUserAuthenticationConverter;
-import com.css.simulation.resource.common.oauth.OauthParameter;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
-import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
-import org.springframework.security.oauth2.provider.token.DefaultAccessTokenConverter;
-import org.springframework.security.oauth2.provider.token.RemoteTokenServices;
-
-import javax.annotation.Resource;
-
-@Configuration
-public class OAuth2Configuration extends ResourceServerConfigurerAdapter {
-
-    @Resource
-    private OauthParameter oauthParameter;
-
-    @Resource
-    MyUserAuthenticationConverter myUserAuthenticationConverter;
-
-    @Override
-    public void configure(ResourceServerSecurityConfigurer resources) {
-        //令牌解析服务配置
-        RemoteTokenServices services = new RemoteTokenServices();
-        services.setCheckTokenEndpointUrl(oauthParameter.getCheckTokenEndpointUrl());  // 需要在授权服务器公开 /oauth/check_token
-        services.setClientId(oauthParameter.getClientId());
-        services.setClientSecret(oauthParameter.getClientSecret());
-        //自定义令牌转换器
-        DefaultAccessTokenConverter defaultAccessTokenConverter = new DefaultAccessTokenConverter();
-        defaultAccessTokenConverter.setUserTokenConverter(myUserAuthenticationConverter);
-        services.setAccessTokenConverter(defaultAccessTokenConverter);
-        resources.resourceId(oauthParameter.getResourceId())      // 资源 id
-                .tokenServices(services)    // 使用远程服务验证令牌的服务
-                .stateless(true);   // 无状态模式，即无需用户登录，无 session
-    }
-
-    /**
-     * 配置拦截请求，通过 scope
-     */
-    @Override
-    public void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable()   // 禁用 csrf
-                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)// 无状态验证
-                .and()
-                .authorizeRequests()
-                .antMatchers("/**/report/**").access("#oauth2.hasScope('other')")//算法平台接口
-                .antMatchers("/**/monitor/createAutomaticSubProject").permitAll()//定时任务接口
-                .antMatchers("/druid/**").permitAll()
-                .anyRequest().access("#oauth2.hasScope('all')") // 拦截所有请求判断 scope
-        ;
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/TransactionConfiguration.java

@@ -1,84 +0,0 @@
-package com.css.simulation.resource.common.configuration;
-
-import org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionManager;
-import org.springframework.transaction.interceptor.*;
-
-import javax.sql.DataSource;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 声明式事务配置
- */
-@Configuration
-public class TransactionConfiguration {
-
-    @Autowired
-    DataSource dataSource;
-
-    @Bean(name = "masterTransactionManager")
-    public DataSourceTransactionManager masterTransactionManager(DataSource dataSource) {
-        return new DataSourceTransactionManager(dataSource);
-    }
-
-    @Autowired
-    @Qualifier(value = "masterTransactionManager")
-    private TransactionManager transactionManager;
-
-    @Bean
-    public TransactionInterceptor txAdvice() {
-
-        /*只读事务，不做更新操作*/
-        RuleBasedTransactionAttribute readOnlyTx = new RuleBasedTransactionAttribute();
-        readOnlyTx.setReadOnly(true);
-        readOnlyTx.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
-
-        /*当前存在事务就使用当前事务，当前不存在事务就创建一个新的事务*/
-        RuleBasedTransactionAttribute requiredTx = new RuleBasedTransactionAttribute();
-        requiredTx.setRollbackRules(Collections.singletonList(new RollbackRuleAttribute(Exception.class)));
-        requiredTx.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
-        requiredTx.setTimeout(5000);
-
-
-        Map<String, TransactionAttribute> txMap = new HashMap<>();
-        txMap.put("save*", requiredTx);
-        txMap.put("insert*", requiredTx);
-        txMap.put("update*", requiredTx);
-        txMap.put("remove*", requiredTx);
-        txMap.put("add*", requiredTx);
-        txMap.put("share*", requiredTx);
-        txMap.put("fx*", requiredTx);
-        txMap.put("del*", requiredTx);
-        /*select,count开头的方法,开启只读,提高数据库访问性能*/
-        txMap.put("select*", readOnlyTx);
-        txMap.put("query*", readOnlyTx);
-        txMap.put("get*", readOnlyTx);
-        txMap.put("list*", readOnlyTx);
-        txMap.put("find*", readOnlyTx);
-        txMap.put("count*", readOnlyTx);
-        txMap.put("*", requiredTx);
-
-        NameMatchTransactionAttributeSource source = new NameMatchTransactionAttributeSource();
-        source.setNameMap(txMap);
-
-        return new TransactionInterceptor(transactionManager, source);
-    }
-
-    @Bean
-    public BeanNameAutoProxyCreator txProxy() {
-        final BeanNameAutoProxyCreator creator = new BeanNameAutoProxyCreator();
-        creator.setInterceptorNames("txAdvice");
-        creator.setBeanNames("*Service");
-        creator.setProxyTargetClass(true);
-        return creator;
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/git/GitConfiguration.java

@@ -1,14 +0,0 @@
-package com.css.simulation.resource.common.configuration.git;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "git")
-@Data
-public class GitConfiguration {
-    private String name;
-    private String url;
-    private String tempDirectory;
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/kafka/KafkaAdminConfiguration.java

@@ -1,24 +0,0 @@
-package com.css.simulation.resource.common.configuration.kafka;
-
-import org.apache.kafka.clients.admin.Admin;
-import org.apache.kafka.clients.admin.KafkaAdminClient;
-import org.apache.kafka.clients.producer.ProducerConfig;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Properties;
-
-@Configuration
-public class KafkaAdminConfiguration {
-
-    @Value("${spring.kafka.bootstrap-servers}")
-    private String bootstrapServers;    // 服务器
-
-    @Bean("myKafkaAdmin")
-    public Admin admin() {
-        Properties properties = new Properties();
-        properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
-        return KafkaAdminClient.create(properties);
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/configuration/sms/SmsConfiguration.java

@@ -1,18 +0,0 @@
-package com.css.simulation.resource.common.configuration.sms;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConfigurationProperties(prefix = "sms")
-@Data
-public class SmsConfiguration {
-    private String secretId;
-    private String secretKey;
-    private String sdkAppId;
-    private String signName;
-    private String templateIdForReset;
-    private String templateIdForCreate;
-    private String kafkaTopic;
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/demo/ctrl/TestCtrl.java

@@ -1,29 +0,0 @@
-package com.css.simulation.resource.common.demo.ctrl;
-
-import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.param.demo.TestPageParam;
-import api.common.pojo.vo.demo.TestVO;
-import com.css.simulation.resource.common.demo.service.TestService;
-import com.github.pagehelper.PageInfo;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-
-@Controller
-@RequestMapping("/test")
-public class TestCtrl {
-
-    @Resource
-    private TestService testService;
-
-    @RequestMapping("/getTestPageList")
-    @ResponseBody
-    public ResponseBodyVO<PageInfo<TestVO>> getTestPageList(@RequestBody TestPageParam pageParam){
-        ResponseBodyVO<PageInfo<TestVO>> response = new ResponseBodyVO<PageInfo<TestVO>>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(testService.getTestPageList(pageParam));
-        return response;
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/demo/mapper/TestMapper.java

@@ -1,17 +0,0 @@
-package com.css.simulation.resource.common.demo.mapper;
-
-
-import api.common.pojo.param.demo.TestPageParam;
-import api.common.pojo.vo.demo.TestVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface TestMapper {
-
-    List<TestVO> getTestPageList(TestPageParam params);
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/demo/service/TestService.java

@@ -1,37 +0,0 @@
-package com.css.simulation.resource.common.demo.service;
-
-import api.common.pojo.constants.DictConstants;
-import api.common.pojo.param.demo.TestPageParam;
-import api.common.pojo.vo.demo.TestVO;
-import com.css.simulation.resource.common.demo.mapper.TestMapper;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.system.service.DictService;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class TestService {
-
-    @Autowired
-    TestMapper testMapper;
-
-    @Autowired
-    DictService dictService;
-
-    public PageInfo<TestVO> getTestPageList(TestPageParam params) {
-        PageUtil.setPageInfo(params);
-        //params.setCreateUserId(AuthUtil.getCurrentUserId());
-        List<TestVO> list = testMapper.getTestPageList(params);
-        //字典翻译
-        //Map<String, Map<String, String>> dictMapsByTypes = dictService.getDictMapsByTypes(DictConstants.LEVEL + "," + DictConstants.DRIVE_TYPE);
-        Map<String, Map<String, String>> dictMapsByTypes = dictService.getDictMapsByTypes(DictConstants.LEVEL,DictConstants.DRIVE_TYPE);
-        list.forEach(testVO ->{
-            testVO.setLevel_name(dictMapsByTypes.get(DictConstants.LEVEL).get(testVO.getLevel()));
-        });
-        return new PageInfo<>(list);
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/log/LogAdvice.java

@@ -1,122 +0,0 @@
-package com.css.simulation.resource.common.log;
-
-import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.po.log.LogOperationPO;
-import api.common.util.LogUtil;
-import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.log.service.LogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-@ControllerAdvice
-public class LogAdvice implements ResponseBodyAdvice {
-
-    @Autowired
-    LogService logService;
-
-    @Override
-    public boolean supports(MethodParameter methodParameter, Class aClass) {
-        return true;
-    }
-
-    @Override
-    public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) {
-        //没有操作标记则返回
-        String operationType = LogUtil.getOperationType();
-        LogUtil.remove();//线程标记清空
-        if(ObjectUtil.isNull(operationType)){
-            return o;
-        }
-        //异常后返回
-        if(o instanceof ResponseBodyVO){
-            boolean status = ((ResponseBodyVO) o).isStatus();
-            if(!status){
-                return o;
-            }
-        }
-        //类注解的模块名
-        Class<?> containingClass = methodParameter.getContainingClass();
-        RequestMapping classAnnotation = containingClass.getAnnotation(RequestMapping.class);
-        if(ObjectUtil.isNull(classAnnotation)){
-            return o;
-        }
-        String modelName = classAnnotation.name();
-        if(ObjectUtil.isNull(modelName)){
-            modelName = "未命名模块";
-        }
-        try {
-            //获取ip
-            String ip = getRemoteAddress(serverHttpRequest);
-            LogOperationPO po = new LogOperationPO();
-            po.setIp(ip);
-            po.setModule(modelName);
-            po.setOperationType(operationType);
-            po.setUserId(AuthUtil.getCurrentUserId());
-            po.setUsername(AuthUtil.getCurrentUsername());
-            logService.saveOperationLog(po);
-        }catch (Exception e){
-            //e.printStackTrace();
-        }
-        return o;
-    }
-
-    //IP地址获取
-    private String getRemoteAddress(ServerHttpRequest serverHttpRequest) {
-        HttpHeaders headers = serverHttpRequest.getHeaders();
-        String ip = headers.getFirst("x-forwarded-for");
-        if(ip != null && ip.length() != 0){
-            if(ip.indexOf(",") != -1){
-                ip = ip.split(",")[0];
-            }
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("Proxy-Client-IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("WL-Proxy-Client-IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("HTTP_CLIENT_IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("HTTP_X_FORWARDED_FOR");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = headers.getFirst("X-Real-IP");
-        }
-        if(ip == null || ip.length() == 0){
-            ip = serverHttpRequest.getRemoteAddress().getAddress().getHostAddress();
-        }
-        if(isIpv4(ip)){
-            return ip;
-        }else{
-            return "Illegal IP address";
-        }
-
-    }
-
-    //IP地址验证，防止非法地址
-    private boolean isIpv4(String ipAddress) {
-        String ip = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
-                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
-                +"(00?\\d|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
-
-        Pattern pattern = Pattern.compile(ip);
-        Matcher matcher = pattern.matcher(ipAddress);
-        return matcher.matches();
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/oauth/AuthorityCheck.java

@@ -1,35 +0,0 @@
-package com.css.simulation.resource.common.oauth;
-
-import api.common.pojo.constants.DictConstants;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import org.springframework.stereotype.Component;
-
-@Component("AuthorityCheck")
-public class AuthorityCheck {
-
-    public boolean admin(){
-        String roleCode = AuthUtil.getCurrentUserRoleCode();
-        switch (roleCode){
-            case DictConstants.ROLE_CODE_SYSADMIN:
-                return true;
-            case DictConstants.ROLE_CODE_ADMIN:
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    public boolean adminAndUser(){
-        String roleCode = AuthUtil.getCurrentUserRoleCode();
-        switch (roleCode){
-            case DictConstants.ROLE_CODE_SYSADMIN:
-                return true;
-            case DictConstants.ROLE_CODE_ADMIN:
-                return true;
-            case DictConstants.ROLE_CODE_UESR:
-                return true;
-            default:
-                return false;
-        }
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/oauth/AuthorizationHolder.java

@@ -1,21 +0,0 @@
-package com.css.simulation.resource.common.oauth;
-
-import org.springframework.core.NamedInheritableThreadLocal;
-
-public class AuthorizationHolder {
-
-    private static final ThreadLocal<String> inheritableRequestAttributesHolder = new NamedInheritableThreadLocal("Authorization");
-
-    public static void setAuthorization(String authorization){
-        inheritableRequestAttributesHolder.set(authorization);
-    }
-
-    public static String getAuthorization(){
-        return inheritableRequestAttributesHolder.get();
-    }
-
-    public static void remove(){
-        inheritableRequestAttributesHolder.remove();
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/oauth/MyUserAuthenticationConverter.java

@@ -1,42 +0,0 @@
-package com.css.simulation.resource.common.oauth;
-
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.AuthorityUtils;
-import org.springframework.security.oauth2.provider.token.DefaultUserAuthenticationConverter;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.util.*;
-
-@Component
-public class MyUserAuthenticationConverter extends DefaultUserAuthenticationConverter {
-
-    @Override
-    public Authentication extractAuthentication(Map<String, ?> map) {
-        List<GrantedAuthority> list = new LinkedList<>();
-        //解析权限
-        if (map.containsKey(AUTHORITIES)) {
-            Object authorities = map.get(AUTHORITIES);
-            if (authorities instanceof String) {
-                list = AuthorityUtils.commaSeparatedStringToAuthorityList((String) authorities);
-            } else if (authorities instanceof Collection) {
-                list = AuthorityUtils.commaSeparatedStringToAuthorityList(StringUtils.collectionToCommaDelimitedString((Collection) authorities));
-            } else {
-                throw new IllegalArgumentException("Authorities must be either a String or a Collection");
-            }
-        }
-        //解析当前登录人信息
-        MyUserDetails userDetails = new MyUserDetails();
-        userDetails.setId((String) map.get("id"));
-        userDetails.setUsername((String) map.get("username"));
-        userDetails.setRoleCode((String) map.get("roleCode"));
-        userDetails.setUseType((String) map.get("useType"));
-        userDetails.setCreateUserId((String) map.get("createUserId"));
-        return new UsernamePasswordAuthenticationToken(userDetails, "N/A", list);
-    }
-
-
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/oauth/MyUserDetails.java

@@ -1,59 +0,0 @@
-package com.css.simulation.resource.common.oauth;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.io.Serializable;
-import java.util.Set;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MyUserDetails implements UserDetails, Serializable {
-    private static final long serialVersionUID = -158357727659030597L;
-    private String id;
-    private String username;
-    private String password;
-    private String roleCode;
-    private String useType;
-    private String createUserId;
-    private Set<GrantedAuthority> authorities;
-
-
-    /**
-     * 默认 false 是将用户账号过期，需改成 true 不过期
-     */
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    /**
-     * 默认 false 是将用户上锁，需改成 true 不上锁
-     */
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    /**
-     * 默认 false 是用户凭证国汽，需改成 true 不过期
-     */
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    /**
-     * 默认 false 是将用户失效，需改成 true 不失效
-     */
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/oauth/OauthParameter.java

@@ -1,17 +0,0 @@
-package com.css.simulation.resource.common.oauth;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Data
-@Component
-@ConfigurationProperties(prefix="oauth")
-public class OauthParameter {
-
-    private String resourceId;
-    private String checkTokenEndpointUrl;
-    private String clientId;
-    private String clientSecret;
-    private String simulationDefaultPassword = "123456";
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/utils/AuthUtil.java

@@ -1,59 +0,0 @@
-package com.css.simulation.resource.common.utils;
-
-import com.css.simulation.resource.common.oauth.MyUserDetails;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * 认证信息工具类
- */
-@Slf4j
-public class AuthUtil {
-
-    /**
-     * 获取当前登录人id
-     */
-    public static String getCurrentUserId() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        return userDetails.getId();
-    }
-
-    /**
-     * 获取当前登录人roleCode
-     */
-    public static String getCurrentUserRoleCode() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        return userDetails.getRoleCode();
-    }
-
-    /**
-     * 获取当前登录人useType
-     */
-    public static String getCurrentUseType() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        return userDetails.getUseType();
-    }
-
-    /**
-     * 获取当前登录人username
-     */
-    public static String getCurrentUsername() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        return userDetails.getUsername();
-    }
-
-    /**
-     * 获取当前登录人createUserId
-     */
-    public static String getCreateUserId() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
-        return userDetails.getCreateUserId();
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/utils/PageUtil.java

@@ -1,21 +0,0 @@
-package com.css.simulation.resource.common.utils;
-
-import api.common.pojo.common.PageVO;
-import com.github.pagehelper.PageHelper;
-
-/**
- * 分页工具类
- */
-public class PageUtil {
-
-    /**
-     * 统一设置分页参数
-     * @param param
-     */
-    public static void setPageInfo(Object param){
-        if(param != null && param instanceof PageVO) {
-            PageVO pagevo = (PageVO) param;
-            PageHelper.startPage(pagevo.getCurrentPage(), pagevo.getPageSize());
-        }
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/common/utils/PoUtil.java

@@ -1,48 +0,0 @@
-package com.css.simulation.resource.common.utils;
-
-import api.common.pojo.common.CommonPO;
-import api.common.pojo.constants.DictConstants;
-import api.common.util.ObjectUtil;
-import api.common.util.TimeUtil;
-
-import java.sql.Timestamp;
-
-public class PoUtil {
-
-    /**
-     * 初始化po的常规字段
-     */
-    public static void initAddPo(CommonPO po){
-        if(ObjectUtil.isNull(po)){
-            return ;
-        }
-        String currentUserId = AuthUtil.getCurrentUserId();
-        Timestamp currentTime = TimeUtil.getNowForMysql();
-        po.setCreateUserId(currentUserId);
-        po.setCreateTime(currentTime);
-        po.setModifyUserId(currentUserId);
-        po.setModifyTime(currentTime);
-        po.setIsDeleted(DictConstants.NO);
-    };
-
-    public static void initDelPo(CommonPO po){
-        if(ObjectUtil.isNull(po)){
-            return ;
-        }
-        String currentUserId = AuthUtil.getCurrentUserId();
-        Timestamp currentTime = TimeUtil.getNowForMysql();
-        po.setModifyUserId(currentUserId);
-        po.setModifyTime(currentTime);
-        po.setIsDeleted(DictConstants.YES);
-    };
-
-    public static void initUpdatePo(CommonPO po){
-        if(ObjectUtil.isNull(po)){
-            return ;
-        }
-        String currentUserId = AuthUtil.getCurrentUserId();
-        Timestamp currentTime = TimeUtil.getNowForMysql();
-        po.setModifyUserId(currentUserId);
-        po.setModifyTime(currentTime);
-    };
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/log/ctrl/LogCtrl.java

@@ -1,50 +0,0 @@
-package com.css.simulation.resource.log.ctrl;
-
-import api.common.pojo.common.ResponseBodyVO;
-import api.common.pojo.param.log.LogPageParam;
-import api.common.pojo.po.log.LogLoginPO;
-import api.common.pojo.po.log.LogOperationPO;
-import api.common.pojo.po.log.LogSystemPO;
-import com.css.simulation.resource.log.service.LogService;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-@Controller
-@RequestMapping("/log")
-public class LogCtrl {
-
-    @Autowired
-    LogService logService;
-
-    @RequestMapping("/getLoginLogPageList")
-    @ResponseBody
-    @PreAuthorize("@AuthorityCheck.admin()")
-    public ResponseBodyVO<PageInfo<LogLoginPO>> getLoginLogPageList(@RequestBody LogPageParam pageParam){
-        ResponseBodyVO<PageInfo<LogLoginPO>> response = new ResponseBodyVO<PageInfo<LogLoginPO>>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(logService.getLoginLogPageList(pageParam));
-        return response;
-    }
-
-    @RequestMapping("/getOperationLogPageList")
-    @ResponseBody
-    @PreAuthorize("@AuthorityCheck.adminAndUser()")
-    public ResponseBodyVO<PageInfo<LogOperationPO>> getOperationLogPageList(@RequestBody LogPageParam pageParam){
-        ResponseBodyVO<PageInfo<LogOperationPO>> response = new ResponseBodyVO<PageInfo<LogOperationPO>>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(logService.getOperationLogPageList(pageParam));
-        return response;
-    }
-
-    @RequestMapping("/getSystemLogPageList")
-    @ResponseBody
-    @PreAuthorize("@AuthorityCheck.admin()")
-    public ResponseBodyVO<PageInfo<LogSystemPO>> getSystemLogPageList(@RequestBody LogPageParam pageParam){
-        ResponseBodyVO<PageInfo<LogSystemPO>> response = new ResponseBodyVO<PageInfo<LogSystemPO>>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(logService.getSystemLogPageList(pageParam));
-        return response;
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/log/mapper/LogMapper.java

@@ -1,32 +0,0 @@
-package com.css.simulation.resource.log.mapper;
-
-import api.common.pojo.param.log.LogPageParam;
-import api.common.pojo.po.log.LogLoginPO;
-import api.common.pojo.po.log.LogOperationPO;
-import api.common.pojo.po.log.LogSystemPO;
-import api.common.pojo.vo.home.LineChartVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface LogMapper {
-
-    void insertOperationLog(LogOperationPO po);
-
-    List<LogLoginPO> getLoginLogPageList(LogPageParam pageParam);
-
-    List<LogOperationPO> getOperationLogPageList(LogPageParam pageParam);
-
-    List<LogOperationPO> getUserOperationLogPageList(LogPageParam pageParam);
-
-    List<LogSystemPO> getSystemLogPageList(LogPageParam pageParam);
-
-    void insertSystemLog(LogSystemPO po);
-
-    List<LineChartVO> getAccessCount(@Param("dateBegin") String dateBegin);
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/log/service/LogService.java

@@ -1,282 +0,0 @@
-package com.css.simulation.resource.log.service;
-
-import api.common.pojo.constants.DictConstants;
-import api.common.pojo.constants.LogConstants;
-import api.common.pojo.param.log.LogPageParam;
-import api.common.pojo.param.model.VehiclePageParam;
-import api.common.pojo.param.scene.SystemUserSceneParam;
-import api.common.pojo.po.log.LogLoginPO;
-import api.common.pojo.po.log.LogOperationPO;
-import api.common.pojo.po.log.LogSystemPO;
-import api.common.pojo.po.model.VehicleTempPO;
-import api.common.pojo.po.scene.SystemScenePackagePO;
-import api.common.pojo.po.system.ClusterPO;
-import api.common.pojo.po.system.ParameterPO;
-import api.common.pojo.po.system.UserPO;
-import api.common.pojo.vo.model.VehicleTempVO;
-import api.common.pojo.vo.scene.UserSceneVO;
-import api.common.pojo.vo.system.UserVO;
-import api.common.util.ObjectUtil;
-import api.common.util.StringUtil;
-import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.log.mapper.LogMapper;
-import com.css.simulation.resource.model.mapper.VehicleTempMapper;
-import com.css.simulation.resource.system.mapper.UserMapper;
-import com.css.simulation.resource.system.service.DictService;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-@Service
-public class LogService {
-
-    @Autowired
-    LogMapper logMapper;
-
-    @Autowired
-    DictService dictService;
-
-    @Autowired
-    UserMapper userMapper;
-
-    @Autowired
-    VehicleTempMapper vehicleTempMapper;
-
-    /**
-     * 保存普通操作日志（异步）
-     */
-    @Async
-    public void saveOperationLog(LogOperationPO po) {
-        po.setId(StringUtil.getRandomUUID());
-        po.setCreateTime(TimeUtil.getNowForMysql());
-        logMapper.insertOperationLog(po);
-    }
-
-    /**
-     * 查询登录日志
-     */
-    public PageInfo<LogLoginPO> getLoginLogPageList(LogPageParam pageParam) {
-        PageUtil.setPageInfo(pageParam);
-        List<LogLoginPO> list = logMapper.getLoginLogPageList(pageParam);
-        return new PageInfo<>(list);
-    }
-
-    /**
-     * 查询普通操作日志
-     */
-    public PageInfo<LogOperationPO> getOperationLogPageList(LogPageParam pageParam) {
-        PageUtil.setPageInfo(pageParam);
-        List<LogOperationPO> list = new ArrayList<>();
-        String roleCode = AuthUtil.getCurrentUserRoleCode();
-        if (DictConstants.ROLE_CODE_UESR.equals(roleCode)) {//普通用户
-            String currentUserId = AuthUtil.getCurrentUserId();
-            pageParam.setContent(currentUserId);//借用该字段传递当前用户id
-            list = logMapper.getUserOperationLogPageList(pageParam);
-        } else {//管理员
-            list = logMapper.getOperationLogPageList(pageParam);
-        }
-        //字典翻译
-        Map<String, Map<String, String>> dictMaps = dictService.getDictMapsByTypes(LogConstants.MODULE_TYPE + "," + LogConstants.OPERATION_TYPE);
-        list.forEach(po -> {
-            po.setModule(dictMaps.get(LogConstants.MODULE_TYPE).get(po.getModule()));
-            po.setOperationType(dictMaps.get(LogConstants.OPERATION_TYPE).get(po.getOperationType()));
-        });
-        return new PageInfo<>(list);
-    }
-
-    /**
-     * 查询系统管理日志
-     */
-    public PageInfo<LogSystemPO> getSystemLogPageList(LogPageParam pageParam) {
-        PageUtil.setPageInfo(pageParam);
-        List<LogSystemPO> list = logMapper.getSystemLogPageList(pageParam);
-        //字典翻译
-        Map<String, Map<String, String>> dictMaps = dictService.getDictMapsByTypes(LogConstants.SYS_LOG_TYPE + "," + DictConstants.ROLE_CODE);
-        list.forEach(po -> {
-            po.setModule(dictMaps.get(LogConstants.SYS_LOG_TYPE).get(po.getModule()));
-            po.setOperationType(dictMaps.get(LogConstants.SYS_LOG_TYPE).get(po.getOperationType()));
-            po.setRoleCode(dictMaps.get(DictConstants.ROLE_CODE).get(po.getRoleCode()));
-        });
-        return new PageInfo<>(list);
-    }
-
-    /**
-     * 记录用户管理模块日志
-     */
-    public void logUser(String operationType, UserPO userPO) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_USER, operationType);
-            String userId = userPO.getId();
-            String username = userPO.getUsername();
-            if (ObjectUtil.isNull(username)) {
-                UserVO userVO = userMapper.getUserInfo(userId);
-                username = userVO.getUsername();
-            }
-            String content = username + " ( ID: " + userId + " )";
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 记录车辆模板管理模块日志
-     */
-    public void logVehicle(String operationType, VehicleTempPO vehicleTempPO) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_VEHICLE, operationType);
-            String vehicleTempId = vehicleTempPO.getId();
-            String modelLabel = vehicleTempPO.getModelLabel();
-            if (ObjectUtil.isNull(modelLabel)) {
-                VehiclePageParam param = new VehiclePageParam();
-                param.setId(vehicleTempId);
-                VehicleTempVO vehicleTempInfo = vehicleTempMapper.getVehicleTempInfo(param);
-                modelLabel = vehicleTempInfo.getModelLabel();
-            }
-            String content = modelLabel + " ( ID: " + vehicleTempId + " )";
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 记录参数管理模块日志
-     */
-    public void logParameter(String operationType, ParameterPO parameterPO) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PARAM, operationType);
-            String paramId = parameterPO.getId();
-            String userId = parameterPO.getUserId();
-            String userName = parameterPO.getUserName();
-            String content = "账户：" + userName + " ( ID: " + userId + " ); 参数配置" + " ( ID: " + paramId + " )";
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 记录集群管理模块日志
-     */
-    public void logCluster(String operationType, ClusterPO clusterPO) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_CLUSTER, operationType);
-            String clusterId = clusterPO.getId();
-            String userId = clusterPO.getUserId();
-            String userName = clusterPO.getUserName();
-            String content = "账户：" + userName + " ( ID: " + userId + " ); 节点配置" + " ( ID: " + clusterId + " )";
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 获取系统管理日志对象
-     */
-    private LogSystemPO getLogSystemPO(String module, String operationType) {
-        LogSystemPO po = new LogSystemPO();
-        po.setId(StringUtil.getRandomUUID());
-        po.setCreateTime(TimeUtil.getNowForMysql());
-        po.setUserId(AuthUtil.getCurrentUserId());
-        po.setUsername(AuthUtil.getCurrentUsername());
-        po.setRoleCode(AuthUtil.getCurrentUserRoleCode());
-        po.setModule(module);
-        po.setOperationType(operationType);
-        return po;
-    }
-
-    /**
-     * 记录场景包模块日志
-     */
-    public void logScenePackage(String operationType, SystemScenePackagePO packagePO, SystemUserSceneParam params) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PACKAGE, operationType);
-            //获取当前登录人姓名
-            String content = null;
-            if (operationType.equals(LogConstants.SYS_LOG_PACKAGE_DELETE)) {
-                content = "删除场景包：" + packagePO.getPackageName() + "(ID:" + packagePO.getId() + ")";
-            } else if (operationType.equals(LogConstants.SYS_LOG_PACKAGE_UPDATE)) {
-                content = "编辑场景包：" + packagePO.getPackageName() + "(ID:" + packagePO.getId() + ")";
-            } else if (operationType.equals(LogConstants.SYS_LOG_PACKAGE_INSERT)) {
-                content = "创建场景包：" + packagePO.getPackageName() + "(ID:" + packagePO.getId() + ")";
-            } else if (operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION)) {
-                List<UserSceneVO> users = params.getUserIds();
-                StringBuffer sb = new StringBuffer();
-                for (UserSceneVO vo : users) {
-                    sb.append("、").append(vo.getUserName()).append("((ID:").append(vo.getUserId()).append(")");
-                }
-                sb.deleteCharAt(0);
-                content = "分配场景包：" + params.getPackageName() + "(ID:" + params.getPackageId() + ")给用户：" + sb.toString();
-            } else if (operationType.equals(LogConstants.SYS_LOG_PACKAGE_DISTRIBUTION_DELETE)) {
-                List<UserSceneVO> users = params.getUserIds();
-                StringBuffer sb = new StringBuffer();
-                for (UserSceneVO vo : users) {
-                    sb.append("、").append(vo.getUserName()).append("((ID:").append(vo.getUserId()).append(")");
-                }
-                sb.deleteCharAt(0);
-                content = "分配场景包：" + params.getPackageName() + "(ID:" + params.getPackageId() + ")时移除用户：" + sb.toString();
-            }
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 记录场景包分配模块日志
-     */
-    public void logSystemUserSceneByPackageId(String operationType, SystemUserSceneParam param, String packageCount) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_PACKAGE_GRANT, operationType);
-            String content = param.getUserName() + "(ID" + param.getUserId() + ")" + "分配场景包：" + packageCount;
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 记录场景库管理模块日志
-     */
-    public void logSceneDelete(String operationType, Map map) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_SCENE, operationType);
-            Map<String, String> mapType = dictService.getDictMapByType(DictConstants.SCENE_TYPE);
-            String content = "删除" + mapType.get(map.get("type")) + ":" + map.get("sceneName");
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 记录场景上传模块日志
-     */
-    public void logSceneUpload(String operationType, String content) {
-        try {
-            LogSystemPO po = getLogSystemPO(LogConstants.SYS_LOG_SCENE_TASK, operationType);
-            //获取当前登录人姓名
-            po.setContent(content);
-            logMapper.insertSystemLog(po);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/project/test/GamePanel.java

@@ -1,80 +0,0 @@
-package com.css.simulation.resource.project.test;
-
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.util.Random;
-
-public class GamePanel extends JPanel implements KeyListener, ActionListener {
-
-    int length;//蛇的默认长度
-
-    int[] snakeX = new int[600];
-
-    int[] snakeY = new int[500];
-
-    String fx;
-
-    //是否开始
-    boolean isStart = false;
-
-    Timer timer = new Timer(100,this);
-
-    //食物坐标
-    int foodX;
-
-    int foodY;
-
-    Random random = new Random();
-
-    //是否失败
-    boolean isFail =false;
-
-    int score;
-
-    Random random_food = new Random();
-
-    int food;
-
-    //构造器
-    public GamePanel(){
-        init();
-        this.setFocusable(true);
-        this.addKeyListener(this);
-    }
-
-    public void init(){
-
-        snakeX[0] = 100;
-        snakeY[0] = 100;
-
-
-
-
-    }
-
-
-
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-
-    }
-
-    @Override
-    public void keyTyped(KeyEvent e) {
-
-    }
-
-    @Override
-    public void keyPressed(KeyEvent e) {
-
-    }
-
-    @Override
-    public void keyReleased(KeyEvent e) {
-
-    }
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/project/test/MainTest.java

@@ -1,23 +0,0 @@
-package com.css.simulation.resource.project.test;
-
-public class MainTest {
-    public static void main(String[] args) {
-        int[] a = new int[]{1,1,2};
-        int i = removeDuplicates(a);
-        System.out.println(i);
-
-    }
-
-    public static int removeDuplicates(int[] nums) {
-        int m = 0;
-        for(int i = 0;i< nums.length;i++){
-            if(nums[i] != nums[m]){
-                nums[++m] = nums[i];
-            }
-        }
-        return ++m;
-
-    }
-
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/project/test/TestDate.java

@@ -1,10 +0,0 @@
-package com.css.simulation.resource.project.test;
-
-import javax.swing.*;
-import java.util.Objects;
-
-public class TestDate {
-
-    public static ImageIcon header = new ImageIcon(Objects.requireNonNull(TestDate.class.getResource("E:\\icon\\1.bmp")));
-    public static ImageIcon body = new ImageIcon(Objects.requireNonNull(TestDate.class.getResource("E:\\icon\\2.bmp")));
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/project/test/TestImage.java

@@ -1,46 +0,0 @@
-package com.css.simulation.resource.project.test;
-
-import javax.swing.*;
-import java.awt.*;
-
-public class TestImage extends JFrame {
-
-    public static void main(String[] args) {
-
-        //创建窗口
-        JFrame jFrame = new JFrame();
-
-        //设置窗体标题
-        jFrame.setTitle("test");
-
-        //窗体是否可见
-        jFrame.setVisible(true);
-
-        //窗体关闭方式(点击关闭按钮)
-        jFrame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-
-        //窗体大小
-/*        Dimension dimension = new Dimension();
-        dimension.setSize(50,50);
-        jFrame.setSize(dimension);*/
-
-        //设置窗体左上角的坐标
-/*        jFrame.setLocation(45,89);*/
-
-        //设置窗体坐标和大小
-        jFrame.setBounds(45,89,500,500);
-
-        //获取窗体容器
-/*        Container contentPane = jFrame.getContentPane();
-
-        //设置窗体背景颜色
-        contentPane.setBackground(Color.white);*/
-
-
-
-
-
-
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/Application.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/SimulationResourceServerApplication.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource;
+package com.css.simulation.resource.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -15,10 +15,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @EnableAsync
 @EnableGlobalMethodSecurity(prePostEnabled=true)
-public class Application {
+public class SimulationResourceServerApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
+        SpringApplication.run(SimulationResourceServerApplication.class, args);
         System.out.println("-------------启动成功----------------");
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/AlgoPlatformService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/AlgoPlatformService.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.feign.fallback.AlgoPlatformServiceFallback;
+import com.css.simulation.resource.server.acl.feign.fallback.AlgoPlatformServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,4 +26,4 @@ public interface AlgoPlatformService {
 
 
 
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/FileDownService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/FileDownService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.feign.fallback.FileDownServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.acl.feign.fallback.FileDownServiceFallback;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -64,4 +64,4 @@ public interface FileDownService {
     @PostMapping("/minio/remove")
     Response remove(@RequestBody @Validated MinioParameter minioParameter);
 
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/project/feign/KafkaService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/KafkaService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.project.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 
 import api.common.pojo.param.KafkaParameter;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.project.feign.fallback.KafkaServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.acl.feign.fallback.KafkaServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/MonitorService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/MonitorService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.feign.fallback.MonitorServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.acl.feign.fallback.MonitorServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -30,4 +30,4 @@ public interface MonitorService {
 
 
 
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/OauthClientService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/OauthClientService.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.feign.fallback.RedisServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.acl.feign.fallback.RedisServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -19,4 +19,4 @@ public interface OauthClientService {
 
 
 
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/RedisService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/RedisService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.feign.fallback.RedisServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.acl.feign.fallback.RedisServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -31,4 +31,4 @@ public interface RedisService {
     @PostMapping("/redis/getDictMaps")
     ResponseBodyVO<Map<String,String>> getDictMaps(List<String> keyList);
 
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/SceneService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/SceneService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.system.SceneImportPO;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.feign.fallback.SceneServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.acl.feign.fallback.SceneServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/SchedulerService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/SchedulerService.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.feign;
+package com.css.simulation.resource.server.acl.feign;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.common.configuration.FeignConfiguration;
-import com.css.simulation.resource.feign.fallback.SchedulerServiceFallback;
+import com.css.simulation.resource.server.infrastructure.common.configuration.FeignConfiguration;
+import com.css.simulation.resource.server.acl.feign.fallback.SchedulerServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -20,4 +20,4 @@ public interface SchedulerService {
     @PostMapping(value = "/algorithm/check")
     ResponseBodyVO<String> check(@RequestParam("minioPath") String minioPath);
 
-}
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/AlgoPlatformServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/AlgoPlatformServiceFallback.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.feign.AlgoPlatformService;
-import org.springframework.stereotype.Component;
+import com.css.simulation.resource.server.acl.feign.AlgoPlatformService;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@Component
+@Service
 public class AlgoPlatformServiceFallback implements AlgoPlatformService {
     @Override
     public ResponseBodyVO<String> getAlgorithmList(String param) {

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/FileDownServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/FileDownServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.MinioParameter;
-import com.css.simulation.resource.feign.FileDownService;
+import com.css.simulation.resource.server.acl.feign.FileDownService;
 import feign.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/project/feign/fallback/KafkaServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/KafkaServiceFallback.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.project.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.param.KafkaParameter;
-import com.css.simulation.resource.project.feign.KafkaService;
+import com.css.simulation.resource.server.acl.feign.KafkaService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/MonitorServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/MonitorServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
-import com.css.simulation.resource.feign.MonitorService;
+import com.css.simulation.resource.server.acl.feign.MonitorService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/OauthClientServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/OauthClientServiceFallback.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.feign.OauthClientService;
+import com.css.simulation.resource.server.acl.feign.OauthClientService;
 import org.springframework.stereotype.Component;
 
 @Component

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/RedisServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/RedisServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
-import com.css.simulation.resource.feign.RedisService;
+import com.css.simulation.resource.server.acl.feign.RedisService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/SceneServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/SceneServiceFallback.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.system.SceneImportPO;
-import com.css.simulation.resource.feign.SceneService;
+import com.css.simulation.resource.server.acl.feign.SceneService;
 import org.springframework.stereotype.Component;
 
 @Component

simulation-resource-server/src/main/java/com/css/simulation/resource/feign/fallback/SchedulerServiceFallback.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/acl/feign/fallback/SchedulerServiceFallback.java

@@ -1,7 +1,7 @@
-package com.css.simulation.resource.feign.fallback;
+package com.css.simulation.resource.server.acl.feign.fallback;
 
 import api.common.pojo.common.ResponseBodyVO;
-import com.css.simulation.resource.feign.SchedulerService;
+import com.css.simulation.resource.server.acl.feign.SchedulerService;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;
 @Component

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/controller/AlgorithmController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/AlgorithmController.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.algorithm.controller;
+package com.css.simulation.resource.server.api.controller;
 
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.algorithm.AlgorithmParameter;
-import com.css.simulation.resource.algorithm.service.AlgorithmService;
+import com.css.simulation.resource.server.application.AlgorithmService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/ClusterController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/ClusterController.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ClusterParam;
 import api.common.pojo.po.system.ClusterPO;
 import api.common.pojo.vo.system.ClusterVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.system.service.ClusterService;
+import com.css.simulation.resource.server.application.ClusterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/DictController.java

@@ -0,0 +1,60 @@
+package com.css.simulation.resource.server.api.controller;
+
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.param.system.DictParam;
+import api.common.pojo.vo.system.DictVO;
+import com.css.simulation.resource.server.application.DictService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+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;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典数据管理
+ */
+@RestController
+@RequestMapping("/dict")
+public class DictController {
+
+    @Resource
+    private DictService dictService;
+
+    /**
+     * 通过字典类型dictTypes将字典数据刷新至缓存，当dictTypes值为all时，将刷新所有字典。
+     */
+    @RequestMapping("/refreshDictsByTypes")
+    @PreAuthorize("@AuthorityCheck.admin()")
+    public ResponseBodyVO<String> refreshDictsByTypes(@RequestBody @Validated DictParam param) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, dictService.refreshDicts(param));
+    }
+
+    /**
+     * 通过字典类型dictTypes从缓存中查询字典数据lists
+     */
+    @RequestMapping("/getDictListsByTypes")
+    public ResponseBodyVO<Map<String, List<DictVO>>> getDictListsByTypes(@RequestBody @Validated DictParam param) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, dictService.getDictListsByTypes(param));
+    }
+
+    /**
+     * 通过字典类型dictTypes从缓存中查询字典数据trees
+     */
+    @RequestMapping("/getDictTreesByTypes")
+    public ResponseBodyVO<Map<String, List<DictVO>>> getDictTreesByTypes(@RequestBody @Validated DictParam param) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, dictService.getDictTreesByTypes(param));
+    }
+
+    /**
+     * 通过字典类型dictTypes从缓存中查询字典数据maps
+     */
+    @RequestMapping("/getDictMapsByTypes")
+    public ResponseBodyVO<Map<String, Map<String, String>>> getDictMapsByTypes(@RequestBody @Validated DictParam param) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, dictService.getDictMapsByTypes(param));
+    }
+
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/FileController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/FileController.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.MinioParameter;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.feign.FileDownService;
+import com.css.simulation.resource.server.acl.feign.FileDownService;
 import feign.Response;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;

simulation-resource-server/src/main/java/com/css/simulation/resource/home/controller/HomePageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/HomePageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.home.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;
@@ -6,12 +6,12 @@ import api.common.pojo.vo.home.HardwareVO;
 import api.common.pojo.vo.home.LineChartVO;
 import api.common.pojo.vo.home.ServiceVO;
 import api.common.pojo.vo.home.SystemServerVO;
-import com.css.simulation.resource.algorithm.service.AlgorithmService;
-import com.css.simulation.resource.home.service.HomePageService;
-import com.css.simulation.resource.model.service.ConfigService;
-import com.css.simulation.resource.project.service.SimulationProjectService;
-import com.css.simulation.resource.scene.service.scene.SceneNaturalService;
-import com.css.simulation.resource.system.service.ClusterService;
+import com.css.simulation.resource.server.application.AlgorithmService;
+import com.css.simulation.resource.server.application.HomePageService;
+import com.css.simulation.resource.server.application.ConfigService;
+import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.application.SceneNaturalService;
+import com.css.simulation.resource.server.application.ClusterService;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/MenuController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/MenuController.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.vo.system.MenuVO;
-import com.css.simulation.resource.system.service.MenuService;
+import com.css.simulation.resource.server.application.MenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/ModelConfigController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/ModelConfigController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -8,7 +8,7 @@ import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.vo.model.ConfigSensorVO;
 import api.common.pojo.vo.model.ConfigVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.model.service.ConfigService;
+import com.css.simulation.resource.server.application.ConfigService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;

simulation-resource-server/src/main/java/com/css/simulation/resource/open/ctrl/MonitorCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/MonitorCtrl.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.open.ctrl;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.project.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.SimulationProjectService;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/ParameterController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/ParameterController.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.ParameterParam;
 import api.common.pojo.po.system.ParameterPO;
 import api.common.pojo.vo.system.ParameterVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.system.service.ParameterService;
+import com.css.simulation.resource.server.application.ParameterService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/open/ctrl/ReportCtrl.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/ReportCtrl.java

@@ -1,12 +1,12 @@
-package com.css.simulation.resource.open.ctrl;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.ProjectReportVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.open.service.ReportService;
-import com.css.simulation.resource.project.service.SimulationProjectService;
+import com.css.simulation.resource.server.application.ReportService;
+import com.css.simulation.resource.server.application.SimulationProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/RoleController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/RoleController.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.RoleParam;
 import api.common.pojo.po.system.RolePO;
 import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.system.service.RoleService;
+import com.css.simulation.resource.server.application.RoleService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneAccidentController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SceneAccidentController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller.scene;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -8,9 +8,9 @@ import api.common.pojo.po.scene.SceneAccidentPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneAccidentVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.scene.SceneAccidentService;
-import com.css.simulation.resource.system.service.SceneImportService;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.application.SceneAccidentService;
+import com.css.simulation.resource.server.application.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneGeneralController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SceneGeneralController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller.scene;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -11,13 +11,13 @@ import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.feign.FileDownService;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.service.scene.SceneGeneralExampleService;
-import com.css.simulation.resource.scene.service.scene.SceneGeneralTemplateService;
-import com.css.simulation.resource.system.service.DictService;
-import com.css.simulation.resource.system.service.SceneImportService;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.application.LogService;
+import com.css.simulation.resource.server.application.SceneGeneralExampleService;
+import com.css.simulation.resource.server.application.SceneGeneralTemplateService;
+import com.css.simulation.resource.server.application.DictService;
+import com.css.simulation.resource.server.application.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/SceneImportController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SceneImportController.java

@@ -1,13 +1,13 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.system.SceneImportPageParam;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.oauth.AuthorizationHolder;
-import com.css.simulation.resource.feign.SceneService;
-import com.css.simulation.resource.system.service.SceneImportService;
+import com.css.simulation.resource.server.infrastructure.common.oauth.AuthorizationHolder;
+import com.css.simulation.resource.server.acl.feign.SceneService;
+import com.css.simulation.resource.server.application.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneNaturalController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SceneNaturalController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller.scene;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -9,9 +9,9 @@ import api.common.pojo.po.scene.SceneNaturalPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneNaturalVO;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.scene.SceneNaturalService;
-import com.css.simulation.resource.system.service.SceneImportService;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.application.SceneNaturalService;
+import com.css.simulation.resource.server.application.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/testpackage/ScenePackageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/ScenePackageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller.testpackage;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -8,12 +8,12 @@ import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import api.common.pojo.vo.scene.ScenePackageVO;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
-import com.css.simulation.resource.scene.service.ScenePackageService;
-import com.css.simulation.resource.system.service.ParameterService;
-import com.css.simulation.resource.util.SceneUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.application.ScenePackageService;
+import com.css.simulation.resource.server.application.ParameterService;
+import com.css.simulation.resource.server.infrastructure.util.SceneUtil;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/scene/SceneStandardsController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SceneStandardsController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller.scene;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -8,10 +8,9 @@ import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.StandardsRegulationsVO;
 import api.common.util.CollectionUtil;
-import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.scene.SceneStandardsService;
-import com.css.simulation.resource.system.service.SceneImportService;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.application.SceneStandardsService;
+import com.css.simulation.resource.server.application.SceneImportService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/controller/score/ScoringRulesController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/ScoringRulesController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.controller.score;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -8,9 +8,9 @@ import api.common.pojo.vo.scene.ScoringRulesVO;
 import api.common.util.ObjectUtil;
 import api.common.util.PythonUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.scene.service.ScoringRulesService;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.application.ScoringRulesService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/SensorCameraController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SensorCameraController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -6,7 +6,7 @@ import api.common.pojo.param.model.CameraParam;
 import api.common.pojo.po.model.CameraPO;
 import api.common.pojo.vo.model.CameraVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.model.service.CameraService;
+import com.css.simulation.resource.server.application.CameraService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/SensorController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SensorController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.model.CameraParam;
@@ -7,10 +7,10 @@ import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.vo.model.SensorNewVO;
 import api.common.pojo.vo.model.SensorVO;
-import com.css.simulation.resource.model.service.CameraService;
-import com.css.simulation.resource.model.service.GpsService;
-import com.css.simulation.resource.model.service.LidarService;
-import com.css.simulation.resource.model.service.OgtService;
+import com.css.simulation.resource.server.application.CameraService;
+import com.css.simulation.resource.server.application.GpsService;
+import com.css.simulation.resource.server.application.LidarService;
+import com.css.simulation.resource.server.application.OgtService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/SensorGpsController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SensorGpsController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -7,7 +7,7 @@ import api.common.pojo.param.model.GpsParam;
 import api.common.pojo.po.model.GpsPO;
 import api.common.pojo.vo.model.GpsVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.model.service.GpsService;
+import com.css.simulation.resource.server.application.GpsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/SensorLidarController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SensorLidarController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -7,7 +7,7 @@ import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.po.model.LidarPO;
 import api.common.pojo.vo.model.LidarVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.model.service.LidarService;
+import com.css.simulation.resource.server.application.LidarService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/SensorOgtController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SensorOgtController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -6,7 +6,7 @@ import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.po.model.OgtPO;
 import api.common.pojo.vo.model.OgtVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.model.service.OgtService;
+import com.css.simulation.resource.server.application.OgtService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/project/controller/SimulationProjectController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SimulationProjectController.java

@@ -1,12 +1,12 @@
-package com.css.simulation.resource.project.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.DictParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
 import api.common.pojo.vo.project.*;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.project.service.SimulationProjectService;
-import com.css.simulation.resource.system.service.ClusterService;
+import com.css.simulation.resource.server.application.SimulationProjectService;
+import com.css.simulation.resource.server.application.ClusterService;
 import com.github.pagehelper.PageInfo;
 
 import org.springframework.web.bind.annotation.PostMapping;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/SyetemUserSceneController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SyetemUserSceneController.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.po.scene.SystemUserScenePO;
-import com.css.simulation.resource.system.service.SystemUserSceneService;
+import com.css.simulation.resource.server.application.SystemUserSceneService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.List;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/SystemScenePackageController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/SystemScenePackageController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.SystemScenePackageParam;
@@ -9,8 +9,8 @@ import api.common.pojo.po.scene.SystemScenePackagePO;
 import api.common.pojo.vo.scene.SystemScenePackageVO;
 import api.common.pojo.vo.scene.SystemUserSceneVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.system.service.SystemScenePackageService;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.application.SystemScenePackageService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.web.bind.annotation.*;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/UserController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/UserController.java

@@ -1,11 +1,11 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.system.UserParam;
 import api.common.pojo.po.system.UserPO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.system.service.UserService;
+import com.css.simulation.resource.server.application.UserService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/controller/UserInfoController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/UserInfoController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -10,12 +10,12 @@ import api.common.pojo.vo.system.ClusterVO;
 import api.common.pojo.vo.system.ParameterVO;
 import api.common.pojo.vo.system.UserVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
-import com.css.simulation.resource.system.service.SystemScenePackageService;
-import com.css.simulation.resource.system.service.ClusterService;
-import com.css.simulation.resource.system.service.ParameterService;
-import com.css.simulation.resource.system.service.UserService;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.application.SystemScenePackageService;
+import com.css.simulation.resource.server.application.ClusterService;
+import com.css.simulation.resource.server.application.ParameterService;
+import com.css.simulation.resource.server.application.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/VehicleController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/VehicleController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -9,7 +9,7 @@ import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.model.service.VehicleService;
+import com.css.simulation.resource.server.application.VehicleService;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/VehicleTemplateController.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/api/controller/VehicleTemplateController.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.model.controller;
+package com.css.simulation.resource.server.api.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.model.VehiclePageParam;
 import api.common.pojo.po.model.VehicleTempPO;
 import api.common.pojo.vo.model.VehicleTempVO;
-import com.css.simulation.resource.model.service.VehicleTempService;
+import com.css.simulation.resource.server.application.VehicleTempService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/service/AlgorithmService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/AlgorithmService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.algorithm.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.algorithm.AlgorithmParameter;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/CameraService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/CameraService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.CameraParam;
@@ -9,9 +9,9 @@ import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.model.mapper.CameraMapper;
-import com.css.simulation.resource.model.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.CameraMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/ClusterService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/ClusterService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -7,11 +7,10 @@ import api.common.pojo.po.system.ClusterPO;
 import api.common.pojo.vo.system.ClusterVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.system.mapper.ClusterMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ClusterMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/ConfigService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/ConfigService.java

@@ -1,16 +1,16 @@
-package com.css.simulation.resource.model.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.*;
 import api.common.pojo.po.model.*;
 import api.common.pojo.vo.model.*;
 import api.common.util.*;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.model.mapper.ConfigMapper;
-import com.css.simulation.resource.model.mapper.ModelConfigMapper;
-import com.css.simulation.resource.model.mapper.RelationConfigSensorMapper;
-import com.css.simulation.resource.model.mapper.VehicleMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ConfigMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.RelationConfigSensorMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.VehicleMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.buf.StringUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/DictService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/DictService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.RedisParameter;
@@ -6,9 +6,8 @@ import api.common.pojo.param.system.DictParam;
 import api.common.pojo.vo.system.DictVO;
 import api.common.util.JsonUtil;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.feign.RedisService;
-import com.css.simulation.resource.system.mapper.DictMapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.css.simulation.resource.server.acl.feign.RedisService;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.DictMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -76,7 +75,7 @@ public class DictService {
         return keySet.toString();
     }
 
-    public Map<String, List<DictVO>> getDictListsByTypes(DictParam param) throws JsonProcessingException {
+    public Map<String, List<DictVO>> getDictListsByTypes(DictParam param) {
         //解析参数进行查询
         String dictTypes = param.getDictTypes();
         List<String> dictTypeList = Arrays.asList(dictTypes.split(","));
@@ -94,7 +93,7 @@ public class DictService {
         return dictLists;
     }
 
-    public Map<String, List<DictVO>> getDictTreesByTypes(DictParam param) throws JsonProcessingException {
+    public Map<String, List<DictVO>> getDictTreesByTypes(DictParam param) {
         //解析参数进行查询
         String dictTypes = param.getDictTypes();
         List<String> dictTypeList = Arrays.asList(dictTypes.split(","));

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/GpsService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/GpsService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.model.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.GpsParam;
@@ -9,10 +9,10 @@ import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.model.mapper.GpsMapper;
-import com.css.simulation.resource.model.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.GpsMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/home/service/HomePageService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/HomePageService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.home.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;
@@ -10,13 +10,13 @@ import api.common.pojo.vo.home.SystemServerVO;
 import api.common.util.NumberUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.feign.OauthClientService;
-import com.css.simulation.resource.home.mapper.HomePageMapper;
-import com.css.simulation.resource.log.mapper.LogMapper;
-import com.css.simulation.resource.project.mapper.SimulationProjectTaskMapper;
-import com.css.simulation.resource.system.mapper.UserMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.acl.feign.OauthClientService;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.HomePageMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.LogMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SimulationProjectTaskMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.UserMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/LidarService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/LidarService.java

@@ -1,18 +1,17 @@
-package com.css.simulation.resource.model.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.LidarParam;
 import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.LidarPO;
-import api.common.pojo.vo.model.GpsVO;
 import api.common.pojo.vo.model.LidarVO;
 import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.model.mapper.LidarMapper;
-import com.css.simulation.resource.model.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.LidarMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/MenuService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/MenuService.java

@@ -1,9 +1,9 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.vo.system.MenuVO;
 import api.common.util.ObjectUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.system.mapper.MenuMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.MenuMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/OgtService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/OgtService.java

@@ -1,19 +1,18 @@
-package com.css.simulation.resource.model.service;
+package com.css.simulation.resource.server.application;
 
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.OgtParam;
 import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.OgtPO;
-import api.common.pojo.vo.model.LidarVO;
 import api.common.pojo.vo.model.OgtVO;
 import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.model.mapper.ModelConfigMapper;
-import com.css.simulation.resource.model.mapper.OgtMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ModelConfigMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.OgtMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/ParameterService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/ParameterService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -7,11 +7,11 @@ import api.common.pojo.po.system.ParameterPO;
 import api.common.pojo.vo.system.ParameterVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.system.mapper.ParameterMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+import com.css.simulation.resource.server.application.LogService;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ParameterMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/open/service/ReportService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/ReportService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.open.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.vo.project.ProjectReportVO;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/RoleService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/RoleService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.param.system.RoleParam;
 import api.common.pojo.po.system.RoleMenuPO;
@@ -6,9 +6,9 @@ import api.common.pojo.po.system.RolePO;
 import api.common.pojo.vo.system.RoleVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.system.mapper.RoleMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.RoleMapper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/scene/SceneAccidentService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SceneAccidentService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service.scene;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -10,13 +10,12 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.feign.FileDownService;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.mapper.SceneAccidentMapper;
-import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
-import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneAccidentMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/scene/SceneGeneralExampleService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SceneGeneralExampleService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service.scene;
+package com.css.simulation.resource.server.application;
 
 
 import api.common.pojo.common.ResponseBodyVO;
@@ -8,11 +8,11 @@ import api.common.pojo.po.scene.SceneGeneralTemplatePO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.*;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.scene.mapper.SceneGeneralDataMapper;
-import com.css.simulation.resource.scene.mapper.SceneGeneralExampleMapper;
-import com.css.simulation.resource.scene.mapper.SceneGeneralTemplateMapper;
-import com.css.simulation.resource.util.SceneUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralDataMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralExampleMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralTemplateMapper;
+import com.css.simulation.resource.server.infrastructure.util.SceneUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/scene/SceneGeneralTemplateService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SceneGeneralTemplateService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service.scene;
+package com.css.simulation.resource.server.application;
 
 
 import api.common.pojo.constants.DictConstants;
@@ -13,13 +13,11 @@ import api.common.pojo.po.system.SceneImportPO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateMbVO;
 import api.common.pojo.vo.scene.SceneGeneralTemplateVO;
 import api.common.util.*;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.mapper.SceneGeneralTemplateMapper;
-import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
-import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
-import com.css.simulation.resource.system.service.DictService;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneGeneralTemplateMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SceneImportService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SceneImportService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.constants.LogConstants;
@@ -9,15 +9,10 @@ import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.common.utils.PageUtil;
-import com.css.simulation.resource.common.utils.PoUtil;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.service.scene.SceneAccidentService;
-import com.css.simulation.resource.scene.service.scene.SceneGeneralTemplateService;
-import com.css.simulation.resource.scene.service.scene.SceneNaturalService;
-import com.css.simulation.resource.scene.service.scene.SceneStandardsService;
-import com.css.simulation.resource.system.mapper.SceneImportMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PageUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.PoUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneImportMapper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/scene/SceneNaturalService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SceneNaturalService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service.scene;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -10,14 +10,13 @@ import api.common.pojo.po.scene.ScenePackagePO;
 import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.feign.FileDownService;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.mapper.SceneNaturalMapper;
-import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
-import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.system.mapper.SystemScenePackageMapper;
-import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneNaturalMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/ScenePackageService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.scene.ScenePackageParam;
@@ -7,10 +7,9 @@ import api.common.pojo.po.scene.*;
 import api.common.pojo.vo.scene.ScenePackageNewVO;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import api.common.util.*;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.scene.mapper.*;
-import com.css.simulation.resource.system.service.ParameterService;
-import com.css.simulation.resource.util.SceneUtil;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.*;
+import com.css.simulation.resource.server.infrastructure.util.SceneUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.util.buf.StringUtils;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/scene/SceneStandardsService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SceneStandardsService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scene.service.scene;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
@@ -10,13 +10,12 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.po.scene.StandardsRegulationsPO;
 import api.common.pojo.po.system.SceneImportPO;
 import api.common.util.*;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.feign.FileDownService;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
-import com.css.simulation.resource.scene.mapper.ScenePackageSublistMapper;
-import com.css.simulation.resource.scene.mapper.SceneStandardsRegulationsMapper;
-import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.acl.feign.FileDownService;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageSublistMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SceneStandardsRegulationsMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemScenePackageSublistMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScoringRulesService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/ScoringRulesService.java

@@ -1,13 +1,13 @@
-package com.css.simulation.resource.scene.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.param.scene.ScoringRulesParam;
 import api.common.pojo.po.scene.ScoringRulesPO;
 import api.common.util.LogUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.scene.mapper.ScenePackageMapper;
-import com.css.simulation.resource.scene.mapper.ScoringRulesMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScenePackageMapper;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.ScoringRulesMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SimulationProjectService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.project.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SystemScenePackageService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SystemScenePackageService.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.LogConstants;
@@ -12,16 +12,11 @@ import api.common.util.CollectionUtil;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.log.service.LogService;
-import com.css.simulation.resource.scene.mapper.*;
-import com.css.simulation.resource.system.mapper.SystemScenePackageMapper;
-import com.css.simulation.resource.system.mapper.SystemScenePackageSublistMapper;
-import com.css.simulation.resource.system.mapper.SystemUserSceneMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.*;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -40,16 +35,16 @@ public class SystemScenePackageService {
     private SystemScenePackageSublistMapper systemScenePackageSublistMapper;
     @Resource
     private SystemUserSceneMapper systemUserSceneMapper;
-    @Autowired
-    LogService logService;
     @Resource
-    SceneAccidentMapper sceneAccidentMapper;
+    private LogService logService;
     @Resource
-    SceneGeneralTemplateMapper sceneGeneralTemplateMapper;
+    private  SceneAccidentMapper sceneAccidentMapper;
     @Resource
-    SceneNaturalMapper sceneNaturalMapper;
+    private  SceneGeneralTemplateMapper sceneGeneralTemplateMapper;
     @Resource
-    SceneStandardsRegulationsMapper sceneStandardsRegulationsMapper;
+    private  SceneNaturalMapper sceneNaturalMapper;
+    @Resource
+    private  SceneStandardsRegulationsMapper sceneStandardsRegulationsMapper;
 
     /**
      * 场景包录入

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/SystemUserSceneService.java → simulation-resource-server/src/main/java/com/css/simulation/resource/server/application/SystemUserSceneService.java

@@ -1,10 +1,10 @@
-package com.css.simulation.resource.system.service;
+package com.css.simulation.resource.server.application;
 
 
 import api.common.pojo.po.scene.SystemUserScenePO;
 import api.common.util.TimeUtil;
-import com.css.simulation.resource.common.utils.AuthUtil;
-import com.css.simulation.resource.system.mapper.SystemUserSceneMapper;
+import com.css.simulation.resource.server.infrastructure.common.utils.AuthUtil;
+import com.css.simulation.resource.server.infrastructure.mysql.mapper.SystemUserSceneMapper;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;