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

（1）IP类配置增加区域GK逻辑

Browse Source 
（2）修复编译ID的重复获取BUG
（3）监测类配置目前不提供区域管控逻辑
This commit is contained in:
wangxin
2018-04-08 16:15:06 +08:00
parent 1f6bbc20ce
commit aaf8dd5afb
20 changed files with 1133 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
View File

@@ -89,6 +89,10 @@ public class ComplexStringCfgController extends BaseController{
cfg.setTableName(tableName);
cfg.initDefaultValue();
cfg.setAction(action);
//监测缺省不需要区域管控
if(action==Constants.ACTION_DJ){
cfg.setIsAreaEffective(0);
}
cfg.setServiceId(serviceId);
model.addAttribute("_cfg", cfg);
model.addAttribute("tableName", tableName);
@@ -171,10 +175,12 @@ public class ComplexStringCfgController extends BaseController{
cfg.setTableName(tableName);
}
}
int compileId = new ConvertTool().getCompileId();
if(cfg.getCompileId()==null){
int compileId = new ConvertTool().getCompileId().intValue();
cfg.setCompileId(compileId);
}
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setCompileId(compileId);
if(cfg.getCfgId()==null){
cfg.setCreatorId(cfg.getCurrentUser().getId());
cfg.setCreateTime(new Date());