1. 动态规则发送筛选条件时新增“日志规则ID”字段

2. 解决防护对象未返回IP字段错误
3. 将queryTasks中的auditStatus从Boolean改为Integer

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<Task> tasks = taskService.queryTasks(taskStatus, taskType, taskName, taskCreator, auditStatus, page, pageSize);

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);
 

src/main/java/com/realtime/protection/server/task/TaskMapper.java

@@ -23,7 +23,7 @@ public interface TaskMapper {
 
     List<Task> 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);

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<Task> queryTasks(Integer taskStatus,
                                  Integer taskType, String taskName, String taskCreator,
-                                 Boolean auditStatus,
+                                 Integer auditStatus,
                                  Integer page, Integer pageSize) {
         List<Task> tasks = taskMapper.queryTasks(taskStatus, taskType, taskName, taskCreator, auditStatus, page, pageSize);
         for (Task task : tasks) {

src/main/resources/mappers/ProtectObjectMapper.xml

@@ -47,7 +47,8 @@
 
     <select id="queryProtectObjects" resultMap="protectObjectMap">
         SELECT
-        protect_object_id, protect_object_name, protect_object_system_name, INET_NTOA(protect_object_ip),
+        protect_object_id, protect_object_name, protect_object_system_name,
+        INET_NTOA(protect_object_ip) as protect_object_ip,
         protect_object_port, protect_object_url, protect_object_protocol, protect_object_audit_status
         FROM t_protect_object
         <where>

src/main/resources/mappers/TaskMapper.xml

@@ -237,6 +237,7 @@
         <result column="task_start_time" property="startTime"/>
         <result column="task_end_time" property="endTime"/>
         <result column="rule_id" property="ruleId"/>
+        <result column="log_rule_id" property="logRuleId"/>
         <result column="source_system" property="sourceSystem"/>
         <result column="event_type" property="eventType"/>
         <collection property="protectObjects">
@@ -255,6 +256,7 @@
                tdr.dynamic_rule_id             as rule_id,
                strategy_template_source_system as source_system,
                strategy_template_name          as event_type,
+               tdr.log_rule_id,
                INET_NTOA(protect_object_ip),
                protect_object_port,
                protect_object_url,