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

修改HTTP配置审核逻辑，删除逻辑，dao层处理逻辑

Browse Source
This commit is contained in:
zhangwei
2018-05-29 14:59:40 +08:00
parent 3f9f9f3088
commit 11e70875c8
10 changed files with 176 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -259,7 +259,8 @@ public abstract class BaseService {
* @param dstList
* @param srcList
* @param cfgType，1为IP类型，2为字符串类型，3为增强字符串，4数值类型，5摘要类,6回调类[但字符串类域配置和增强字符串域配置在接口参数中同属于strRegionList]
* @param groupId，组号
* @param baseCfg，配置基本信息
* @param groupRelationList 配置分组列表
* @return
*/
public static Map<String,List> cfgConvert(List dstList,List srcList,Integer cfgType,BaseCfg baseCfg,List groupRelationList){
@@ -279,26 +280,29 @@ public abstract class BaseService {
BeanUtils.copyProperties(baseIpCfg, cfg);
cfg.setGroupId(group.getGroupId());
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid());
cfg = ipConvert(cfg,baseIpCfg);
dstList.add(cfg);
//如果protocolId非空非零，需要构造数值型域配置，并且只构造一条
if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0 && groupId!=0){
//如果protocolId非空非零，需要构造数值型域配置
if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0){
if(groupId==0){//只构造一次配置分组
GroupCfg group1 = new GroupCfg();
groupId = ConfigServiceUtil.getId(2, 1).get(0);
group1.setGroupId(groupId);
group1.setCompileId(baseIpCfg.getCompileId());
group1.setAuditTime(baseIpCfg.getAuditTime());
group1.setIsValid(baseIpCfg.getIsValid());
group1.setIsValid(baseCfg.getIsValid());
groupRelationList.add(group1);
}
NumBoundaryCfg numCfg = new NumBoundaryCfg();
numCfg.setLowBoundary(baseIpCfg.getProtocolId());
numCfg.setUpBoundary(baseIpCfg.getProtocolId());
numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
numCfg.setAuditTime(baseIpCfg.getAuditTime());
numCfg.setAuditTime(baseCfg.getAuditTime());
numCfg.setGroupId(groupId);
numCfg.setCfgType(baseIpCfg.getCfgType());
cfg.setIsValid(baseCfg.getIsValid());
numRegionList.add(numCfg);
map.put("numRegionList",numRegionList);
}
@@ -310,6 +314,8 @@ public abstract class BaseService {
BeanUtils.copyProperties(srcList.get(i), cfg);
cfg.setGroupId(group.getGroupId());
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid());
dstList.add(cfg);
}
}else if(cfgType==4){
@@ -318,6 +324,8 @@ public abstract class BaseService {
BeanUtils.copyProperties(srcList.get(i), cfg);
cfg.setGroupId(group.getGroupId());
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid());
dstList.add(cfg);
}
}else{