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

修复ip地址审核后ip状态未改变

Browse Source
This commit is contained in:
leijun
2018-10-29 18:19:56 +08:00
parent 01f8c7ea50
commit 344369b58c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/configuration/IpCfgService.java
View File

@@ -528,6 +528,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
Properties props=this.getMsgProp(); Properties props=this.getMsgProp();
//修改数据库审核状态信息 //修改数据库审核状态信息
entity.setTableName(CfgIndexInfo.getTablename()); entity.setTableName(CfgIndexInfo.getTablename());
entity.setIsAudit(isAudit);
ipCfgDao.auditCfg(entity); ipCfgDao.auditCfg(entity);
ToMaatBean maatBean = new ToMaatBean(); ToMaatBean maatBean = new ToMaatBean();
MaatCfg maatCfg = new MaatCfg(); MaatCfg maatCfg = new MaatCfg();
@@ -555,11 +556,14 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
} }
} }
for(IpPortCfg cfg:entity.getIpPortList()) { for(IpPortCfg cfg:entity.getIpPortList()) {
BeanUtils.copyProperties(entity, cfg, new String[]{"userRegion1","userRegion2","userRegion3","userRegion4","userRegion5","ipType","direction", BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
cfg.setTableName(IpPortCfg.getTablename());
ipCfgDao.auditCfg(cfg);
/*BeanUtils.copyProperties(entity, cfg, new String[]{"userRegion1","userRegion2","userRegion3","userRegion4","userRegion5","ipType","direction",
"protocol","protocolId","areaEffectiveIds","cfgRegionCode", "protocol","protocolId","areaEffectiveIds","cfgRegionCode",
"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"}); "cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});
cfg.setTableName(IpPortCfg.getTablename()); cfg.setTableName(IpPortCfg.getTablename());
ipCfgDao.auditCfg(cfg); ipCfgDao.auditCfg(cfg);*/
} }
if(isAudit==1&&maatType==Constants.MAAT_TYPE){ if(isAudit==1&&maatType==Constants.MAAT_TYPE){
Map<String,List> map = cfgConvert(ipRegionList,entity.getIpPortList(),1,entity,groupRelationList); Map<String,List> map = cfgConvert(ipRegionList,entity.getIpPortList(),1,entity,groupRelationList);