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

1、修正网站、文件传输提交审核时区域IP列表为空的BUG；

Browse Source 
2、修改HTTP的配置域标识，与服务接口端统一。

Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-11 17:47:44 +08:00
parent 80381c2eb2
commit d363b0595d
12 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
View File

@@ -124,7 +124,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
//无效子配置后，再新增子配置
fileTransferCfgDao.deleteFtpIpCfg(entity);
fileTransferCfgDao.deleteFtpKeywordCfg(entity);
fileTransferCfgDao.deleteFtpFileDigestCfg(entity);
fileTransferCfgDao.deleteFileDigestCfg(entity);
AreaIpCfg area = new AreaIpCfg();
area.setCompileId(entity.getCompileId());
area.setFunctionId(entity.getFunctionId());
@@ -246,13 +246,14 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
}
//保存区域IP信息
if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
if(!StringUtil.isEmpty(areaIpCfgList)){
AreaIpCfg cfg = new AreaIpCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
cfg.setTableName(AreaIpCfg.getTablename());
fileTransferCfgDao.auditCfg(cfg);
if(isAudit==1){
Map<String,List> map = cfgConvert(areaIpRegionList,entity.getAreaCfg(),1,entity,groupRelationList);
Map<String,List> map = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
groupRelationList=map.get("groupList");
areaIpRegionList=map.get("dstList");
}