gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1)复用类型Ip导入验证修复

Browse Source 
(2)隧道类配置IP导入模板修改
(3)IP拦截配置导入模板修改
(4)IPSCIP配置导入验证逻辑修改，当action为drop的时候，输入50或者51,监测的时候为0
(5)IP拦截配置导入模板修改
This commit is contained in:
wangxin
2018-07-31 12:18:34 +08:00
parent 1a94c225bc
commit 8b3efbcfbf
14 changed files with 205 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/configuration/CommonController.java
View File

@@ -218,7 +218,7 @@ public class CommonController extends BaseController {
try {
ImportExcel ei = new ImportExcel(file, 0, 0);
List<IpCfgTemplate> list = ei.getDataList(IpCfgTemplate.class);
this.checkIpCfg(ipCfg.getFunctionId(),list);
this.checkIpCfg(ipCfg.getAction().intValue(),ipCfg.getFunctionId(),list);
List<BaseIpCfg> ipList = new ArrayList<>();
Date date=new Date();
for(IpCfgTemplate cfg : list){
@@ -245,7 +245,7 @@ public class CommonController extends BaseController {
try {
ImportExcel ei = new ImportExcel(file, 0, 0);
List<IpCfgTemplate> list = ei.getDataList(clazz);
this.checkIpCfg(ipCfg.getFunctionId(),list);
this.checkIpCfg(ipCfg.getAction().intValue(),ipCfg.getFunctionId(),list);
List<BaseIpCfg> ipList = new ArrayList<>();
Date date=new Date();
for(IpCfgTemplate cfg : list){