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/StringCfgController.java
View File

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