diff --git a/src/main/java/com/realtime/protection/server/task/TaskController.java b/src/main/java/com/realtime/protection/server/task/TaskController.java index 23e1d4b..c289dce 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskController.java +++ b/src/main/java/com/realtime/protection/server/task/TaskController.java @@ -70,7 +70,7 @@ public class TaskController implements TaskControllerApi { @RequestParam(value = "task_type", required = false) Integer taskType, @RequestParam(value = "task_name", required = false) String taskName, @RequestParam(value = "task_creator", required = false) String taskCreator, - @RequestParam(value = "audit_status", required = false) Boolean auditStatus, + @RequestParam(value = "audit_status", required = false) Integer auditStatus, @RequestParam("page") @Min(1) Integer page, @RequestParam("page_size") @Min(1) Integer pageSize) { List tasks = taskService.queryTasks(taskStatus, taskType, taskName, taskCreator, auditStatus, page, pageSize); diff --git a/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java b/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java index ed1a995..4524f46 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java +++ b/src/main/java/com/realtime/protection/server/task/TaskControllerApi.java @@ -190,7 +190,7 @@ public interface TaskControllerApi { @RequestParam(value = "task_type", required = false) Integer taskType, @RequestParam(value = "task_name", required = false) String taskName, @RequestParam(value = "task_creator", required = false) String taskCreator, - @RequestParam(value = "audit_status", required = false) Boolean auditStatus, + @RequestParam(value = "audit_status", required = false) Integer auditStatus, @RequestParam("page") @Min(1) Integer page, @RequestParam("page_size") @Min(1) Integer pageSize); diff --git a/src/main/java/com/realtime/protection/server/task/TaskMapper.java b/src/main/java/com/realtime/protection/server/task/TaskMapper.java index 3dfbdc5..b8dca78 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskMapper.java +++ b/src/main/java/com/realtime/protection/server/task/TaskMapper.java @@ -23,7 +23,7 @@ public interface TaskMapper { List queryTasks(@Param("task_status") Integer taskStatus, @Param("task_type") Integer task_type, @Param("task_name") String taskName, @Param("task_creator") String taskCreator, - @Param("task_audit_status") Boolean auditStatus, + @Param("task_audit_status") Integer auditStatus, @Param("page") Integer page, @Param("page_size") Integer pageSize); Task queryTask(@Param("task_id") Long taskId); diff --git a/src/main/java/com/realtime/protection/server/task/TaskService.java b/src/main/java/com/realtime/protection/server/task/TaskService.java index 9a1c70f..79e1a5d 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskService.java +++ b/src/main/java/com/realtime/protection/server/task/TaskService.java @@ -30,6 +30,8 @@ public class TaskService { task.setTaskCreateUsername("xxx"); task.setTaskCreateDepart("xxx"); + // todo: 添加新建任务时,将动态/静态规则从“已审核”修改为“使用中” + taskMapper.newTask(task); if (task.getStaticRuleIds() != null && !task.getStaticRuleIds().isEmpty()) @@ -44,7 +46,7 @@ public class TaskService { @Transactional public List queryTasks(Integer taskStatus, Integer taskType, String taskName, String taskCreator, - Boolean auditStatus, + Integer auditStatus, Integer page, Integer pageSize) { List tasks = taskMapper.queryTasks(taskStatus, taskType, taskName, taskCreator, auditStatus, page, pageSize); for (Task task : tasks) { diff --git a/src/main/resources/mappers/ProtectObjectMapper.xml b/src/main/resources/mappers/ProtectObjectMapper.xml index 410fb83..d9d25c7 100644 --- a/src/main/resources/mappers/ProtectObjectMapper.xml +++ b/src/main/resources/mappers/ProtectObjectMapper.xml @@ -47,7 +47,8 @@