打分

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/mq/kafka/consumer/ProjectConsumer.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/consumer/ProjectConsumer.java

@@ -1,8 +1,8 @@
-package com.css.simulation.resource.scheduler.infra.mq.kafka.consumer;
+package com.css.simulation.resource.scheduler.adapter.consumer;
 
 
 import api.common.util.JsonUtil;
-import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
+import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
 import com.css.simulation.resource.scheduler.application.service.ProjectApplicationService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

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

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/api/controller/CpuNodeController.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/CpuNodeController.java

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/api/controller/NodeController.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/NodeController.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.api.controller;
+package com.css.simulation.resource.scheduler.adapter.controller;
 
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;
 import org.springframework.cloud.context.config.annotation.RefreshScope;

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

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.api.controller;
+package com.css.simulation.resource.scheduler.adapter.controller;
 
 
 import com.css.simulation.resource.scheduler.application.service.TaskApplicationService;

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

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

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/api/model/ProjectMessageModel.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/adapter/controller/model/ProjectMessageModel.java

@@ -1,4 +1,4 @@
-package com.css.simulation.resource.scheduler.api.model;
+package com.css.simulation.resource.scheduler.adapter.controller.model;
 
 import lombok.*;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/entity/ProjectWaitQueueEntity.java

@@ -1,6 +1,6 @@
 package com.css.simulation.resource.scheduler.application.entity;
 
-import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
+import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
 import lombok.*;
 
 @EqualsAndHashCode

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

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.application.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
-import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
+import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
 import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
 import com.css.simulation.resource.scheduler.application.entity.VehicleEntity;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;

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

@@ -3,7 +3,7 @@ package com.css.simulation.resource.scheduler.domain.service;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.constants.DictConstants;
 import api.common.util.*;
-import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
+import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
 import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
 import com.css.simulation.resource.scheduler.infra.configuration.custom.CustomConfiguration;
 import com.css.simulation.resource.scheduler.infra.configuration.entity.NodeEntity;

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

@@ -2,7 +2,7 @@ package com.css.simulation.resource.scheduler.infra.configuration.scheduler;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.util.CollectionUtil;
-import com.css.simulation.resource.scheduler.api.model.ProjectMessageModel;
+import com.css.simulation.resource.scheduler.adapter.controller.model.ProjectMessageModel;
 import com.css.simulation.resource.scheduler.application.entity.ProjectWaitQueueEntity;
 import com.css.simulation.resource.scheduler.application.service.ProjectApplicationService;
 import com.css.simulation.resource.scheduler.domain.service.ProjectDomainService;

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infra/db/mysql/mapper/IndexTemplateMapper.java

@@ -26,6 +26,7 @@ public interface IndexTemplateMapper {
             @Result(column = "root_id", property = "rootId", jdbcType = JdbcType.VARCHAR),
             @Result(column = "package_level", property = "packageLevel", jdbcType = JdbcType.VARCHAR),
             @Result(column = "rule_name", property = "ruleName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "rule_name_array", property = "ruleNameArray", jdbcType = JdbcType.VARCHAR),
             @Result(column = "package_and_rules", property = "ruleId", jdbcType = JdbcType.VARCHAR),
             @Result(column = "rule_details", property = "ruleDetails", jdbcType = JdbcType.VARCHAR)
     })