1、动态、静态规则、任务、白名单、防护对象、策略模板的查询总数增加了条件
2、指令分页查询还有bug
This commit is contained in:
@@ -104,7 +104,8 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
|
||||
.setData("success", true)
|
||||
.setData("dynamic_rule_list", dynamicRuleService.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId,
|
||||
protectObjectSourceSystem, creator, page, pageSize))
|
||||
.setData("total_num",dynamicRuleService.queryDynamicRuleTotalNum());
|
||||
.setData("total_num",dynamicRuleService.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId,
|
||||
protectObjectSourceSystem, creator));
|
||||
}
|
||||
|
||||
//详情查看?? 就是按id查询吧
|
||||
|
||||
@@ -41,5 +41,6 @@ public interface DynamicRuleMapper {
|
||||
|
||||
boolean queryProtectObjectById(Integer protectObjectId);
|
||||
|
||||
Integer queryDynamicRuleTotalNum();
|
||||
Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId,
|
||||
String sourceSystem, String creator);
|
||||
}
|
||||
|
||||
@@ -161,7 +161,9 @@ public class DynamicRuleService {
|
||||
templateSourceSystem, creator, page, pageSize);
|
||||
}
|
||||
|
||||
public Integer queryDynamicRuleTotalNum() {
|
||||
return dynamicRuleMapper.queryDynamicRuleTotalNum();
|
||||
public Integer queryDynamicRuleTotalNum(String dynamicRuleName, Integer dynamicRuleId,
|
||||
String protectObjectSourceSystem, String creator) {
|
||||
return dynamicRuleMapper.queryDynamicRuleTotalNum(dynamicRuleName, dynamicRuleId,
|
||||
protectObjectSourceSystem, creator);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -139,7 +139,8 @@ public class StaticRuleController implements StaticRuleControllerApi {
|
||||
static_rule_creator, static_rule_ip, page, pageSize);
|
||||
return ResponseResult.ok()
|
||||
.setData("static_rule_list", pageResult)
|
||||
.setData("total_num",staticRuleService.queryStaticRuleTotalNum());
|
||||
.setData("total_num",staticRuleService.queryStaticRuleTotalNum(static_rule_name, static_rule_id,
|
||||
static_rule_creator, static_rule_ip));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -39,5 +39,6 @@ public interface StaticRuleMapper {
|
||||
|
||||
Boolean updateAuditStatusById(Integer id, Integer auditStatus);
|
||||
|
||||
Integer queryStaticRuleTotalNum();
|
||||
Integer queryStaticRuleTotalNum(String static_rule_name, Integer static_rule_id,
|
||||
String static_rule_create_username, String ip);
|
||||
}
|
||||
|
||||
@@ -148,7 +148,9 @@ public class StaticRuleService {
|
||||
staticRuleMapper.deleteStaticRuleById(id);
|
||||
}
|
||||
|
||||
public Integer queryStaticRuleTotalNum() {
|
||||
return staticRuleMapper.queryStaticRuleTotalNum();
|
||||
public Integer queryStaticRuleTotalNum(String static_rule_name, Integer static_rule_id,
|
||||
String static_rule_creator, String static_rule_ip) {
|
||||
return staticRuleMapper.queryStaticRuleTotalNum(static_rule_name, static_rule_id,
|
||||
static_rule_creator, static_rule_ip);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user