From 18a3480f104d165ae23d6a2bfc6b7a02262ca0c0 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Wed, 18 Jul 2018 13:46:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=9A=84=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E6=9C=80=E5=90=8E=E4=BB=A5=09\t;[op?= =?UTF-8?q?=5Ftime]; 0;\n=E7=BB=93=E6=9D=9F(=E9=99=A4=E4=BA=86261?= =?UTF-8?q?;262;263;264;389;390;391;392)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationConfig-parser.xml | 1 + .../maatXml/applicationConfig-maatRedis.xml | 23 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml index 28275dd..6a97c60 100644 --- a/src/main/resources/commonSources/applicationConfig-parser.xml +++ b/src/main/resources/commonSources/applicationConfig-parser.xml @@ -126,6 +126,7 @@ + diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml index 1719ff5..b062584 100644 --- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml +++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml @@ -33,7 +33,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[action];\t;[level];\t;[description];\t;[is_valid];\n + [cfg_id];\t;[service];\t;[action];\t;[level];\t;[description];\t;[is_valid];\t;[op_time]; 0;\n 1 @@ -55,7 +55,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[action];\t;[service];\t;[op_time]; \n + [cfg_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[action];\t;[service];\t;[op_time]; 0;\n 1 @@ -76,7 +76,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[policy_group];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]; [service];\t;[action];\n + [cfg_id];\t;[policy_group];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[service];\t;[action];\t[op_time]; 0;\n 1 @@ -97,7 +97,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[req_strate_id];\t;[strate_name];\t;[res_group_1_id];\t;[res_group_1_num];\t;[res_group_2_id];\t;[res_group_2_num];\t;[res_group_3_id];\t;[res_group_3_num];\t;[res_group_4_id];\t;[res_group_4_num];\t;[res_group_5_id];\t;[res_group_5_num];\t;[min_ttl];\t;[max_ttl];\t;[is_valid];\t;[service];\t;[action];\n + [cfg_id];\t;[req_strate_id];\t;[strate_name];\t;[res_group_1_id];\t;[res_group_1_num];\t;[res_group_2_id];\t;[res_group_2_num];\t;[res_group_3_id];\t;[res_group_3_num];\t;[res_group_4_id];\t;[res_group_4_num];\t;[res_group_5_id];\t;[res_group_5_num];\t;[min_ttl];\t;[max_ttl];\t;[is_valid];\t;[service];\t;[action];\t[op_time]; 0;\n 1 @@ -118,8 +118,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[addr_type];\t;[protocol];\t;[ip];\t;[port];\t;[direction];\t;[user_region];\t;[location];\t;[is_valid];\t;[action];\t;[service];\t;[policy_group];\t;[op_time]; \n - + [cfg_id];\t;[addr_type];\t;[protocol];\t;[ip];\t;[port];\t;[direction];\t;[user_region];\t;[location];\t;[is_valid];\t;[action];\t;[service];\t;[policy_group];\t[op_time]; 0;\n 1 @@ -149,27 +148,27 @@ EFFECTIVE_RULE;:;{ip_region_table_name};,;[region_id] - [region_id];\t;[group_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]; 0;\t;[action];\t;[service];\t;[user_region];\n + [region_id];\t;[group_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[action];\t;[service];\t;[user_region];\t;[op_time]; 0;\n EFFECTIVE_RULE;:;{str_region_table_name};,;[region_id] - [region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]; 0;\t;[action];\t;[service];\t;[user_region];\n + [region_id];\t;[group_id];\t;[keywords];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[action];\t;[service];\t;[user_region];\t;[op_time]; 0;\n EFFECTIVE_RULE;:;{str_str_region_table_name};,;[region_id] - [region_id];\t;[group_id];\t;[keywords];\t;[district];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[op_time]; 0;\t;[action];\t;[service];\t;[user_region];\n + [region_id];\t;[group_id];\t;[keywords];\t;[district];\t;[expr_type];\t;[match_method];\t;[is_hexbin];\t;[is_valid];\t;[action];\t;[service];\t;[user_region];\t;[op_time]; 0;\n EFFECTIVE_RULE;:;{num_region_table_name};,;[region_id] - [region_id];\t;[group_id];\t;[low_boundary];\t;[up_boundary];\t;[is_valid];\t;[op_time]; 0;\t;[action];\t;[service];\t;[user_region];\n + [region_id];\t;[group_id];\t;[low_boundary];\t;[up_boundary];\t;[is_valid];\t;[action];\t;[service];\t;[user_region];\t;[op_time]; 0;\n EFFECTIVE_RULE;:;{file_digest_table_name};,;[region_id] - [region_id];\t;[group_id];\t;[raw_len];\t;[digest];\t;[cfds_level];\t;[is_valid];\t;[op_time]; 0;\t;[action];\t;[service];\t;[user_region];\n + [region_id];\t;[group_id];\t;[raw_len];\t;[digest];\t;[cfds_level];\t;[is_valid];\t;[action];\t;[service];\t;[user_region];\t;[op_time]; 0;\n EFFECTIVE_RULE;:;{ip_client_range_table_name};,;[region_id] - [region_id];\t;[group_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[op_time]; 0;\t;[action];\t;[service];\t;[user_region];\n + [region_id];\t;[group_id];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[action];\t;[service];\t;[user_region];\t;[op_time]; 0;\n MAAT_UPDATE_STATUS From 922db93f258bac3d7ab90bd4689a9735ec783abe Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Wed, 18 Jul 2018 14:51:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/maatXml/applicationConfig-maatRedis.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml index b062584..c4d1129 100644 --- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml +++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml @@ -10,6 +10,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] + [cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[op_time];\t;[service];\t;[action]; 0;\t;[file_id];\n @@ -76,7 +77,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[policy_group];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[service];\t;[action];\t[op_time]; 0;\n + [cfg_id];\t;[policy_group];\t;[addr_type];\t;[src_ip];\t;[mask_src_ip];\t;[src_port];\t;[mask_src_port];\t;[dst_ip];\t;[mask_dst_ip];\t;[dst_port];\t;[mask_dst_port];\t;[protocol];\t;[direction];\t;[is_valid];\t;[service];\t;[action];\t;[op_time]; 0;\n 1 @@ -97,7 +98,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[req_strate_id];\t;[strate_name];\t;[res_group_1_id];\t;[res_group_1_num];\t;[res_group_2_id];\t;[res_group_2_num];\t;[res_group_3_id];\t;[res_group_3_num];\t;[res_group_4_id];\t;[res_group_4_num];\t;[res_group_5_id];\t;[res_group_5_num];\t;[min_ttl];\t;[max_ttl];\t;[is_valid];\t;[service];\t;[action];\t[op_time]; 0;\n + [cfg_id];\t;[req_strate_id];\t;[strate_name];\t;[res_group_1_id];\t;[res_group_1_num];\t;[res_group_2_id];\t;[res_group_2_num];\t;[res_group_3_id];\t;[res_group_3_num];\t;[res_group_4_id];\t;[res_group_4_num];\t;[res_group_5_id];\t;[res_group_5_num];\t;[min_ttl];\t;[max_ttl];\t;[is_valid];\t;[service];\t;[action];\t;[op_time]; 0;\n 1 From b1a43100b0593d7640a2afc8139ebb1e473f7068 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Thu, 19 Jul 2018 09:39:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?voip=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/restful/MmVoipLog.java | 17 +++++++++-------- .../java/com/nis/web/dao/DfLogSearchDao.xml | 10 ++++------ .../web/service/restful/NtcReportService.java | 8 ++++++++ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/nis/domain/restful/MmVoipLog.java b/src/main/java/com/nis/domain/restful/MmVoipLog.java index b116e54..46c62c4 100644 --- a/src/main/java/com/nis/domain/restful/MmVoipLog.java +++ b/src/main/java/com/nis/domain/restful/MmVoipLog.java @@ -37,11 +37,11 @@ public class MmVoipLog extends LogEntity { protected String toFromStoreUrl; @ApiModelProperty(value="节目ID", required=true) protected String pid; - @ApiModelProperty(value="节目访问地址", required=true) - protected String url; @ApiModelProperty(value="封堵现场片段路径", required=true) protected String logUri; @ApiModelProperty(value="封堵类型", required=true) + protected Integer level; + @ApiModelProperty(value="封堵类型", required=true) protected Integer fdType; public String getPid() { @@ -50,12 +50,6 @@ public class MmVoipLog extends LogEntity { public void setPid(String pid) { this.pid = pid; } - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; - } public String getLogUri() { return logUri; } @@ -128,4 +122,11 @@ public class MmVoipLog extends LogEntity { public void setToFromStoreUrl(String toFromStoreUrl) { this.toFromStoreUrl = toFromStoreUrl; } + public Integer getLevel() { + return level; + } + public void setLevel(Integer level) { + this.level = level; + } + } diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index 514ed6d..0bbd857 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -511,20 +511,18 @@ + - - - - - + + - + diff --git a/src/main/java/com/nis/web/service/restful/NtcReportService.java b/src/main/java/com/nis/web/service/restful/NtcReportService.java index 447d377..dd60189 100644 --- a/src/main/java/com/nis/web/service/restful/NtcReportService.java +++ b/src/main/java/com/nis/web/service/restful/NtcReportService.java @@ -34,6 +34,7 @@ public class NtcReportService extends BaseLogService { public Page findNtcPzReport(Page page, NtcPzReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcPzReport(entity)); if ("1".equals(entity.getSearchBusinessType())) { Page pageTotal = new Page(); @@ -59,36 +60,43 @@ public class NtcReportService extends BaseLogService { public Page findNtcServiceReport(Page page, NtcServiceReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcServiceReport(entity)); return page; } public Page findNtcTagReport(Page page, NtcTagReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcTagReport(entity)); return page; } public Page findNtcAttrTypeReport(Page page, NtcAttrTypeReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcAttrTypeReport(entity)); return page; } public Page findNtcLwhhReport(Page page, NtcLwhhReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcLwhhReport(entity)); return page; } public Page findNtcSrcipDomesticReport(Page page, NtcSrcipDomesticReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcSrcipDomesticReport(entity)); return page; } public Page findNtcDestipCountryReport(Page page, NtcDestipCountryReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcDestipCountryReport(entity)); return page; } public Page findNtcEntranceReport(Page page, NtcEntranceReport entity) throws Exception { + entity.setPage(page); page.setList(dao.findNtcEntranceReport(entity)); return page; }