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

1.P2P审核未通过的配置修改后改为未审核状态 2.P2P新增界面Hash配置只能选择十六进制

Browse Source
This commit is contained in:
zhangwenqing
2018-08-19 18:00:08 +08:00
parent 86d8663994
commit 32b229e233
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,7 +558,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
* @param entity
*/
public void saveP2pCfg(CfgIndexInfo entity){
//设置区域运营商信息
// 设置区域运营商信息
setAreaEffectiveIds(entity);
if(entity.getCfgId()==null){
Integer compileId = 0;
@@ -608,7 +608,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
}
}
//保存区域IP信息
// 保存区域IP信息
if(entity.getAreaCfg()!=null){
for(AreaIpCfg cfg:entity.getAreaCfg()){
cfg.initDefaultValue();
@@ -623,8 +623,16 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
}else{
// 审核未通过状态的配置 修改后状态改为未审核
CfgIndexInfo cfgIndexInfo = fileTransferCfgDao.getCfgIndexInfo(entity.getCfgId());
if(cfgIndexInfo.getIsAudit() == 2) {
entity.setIsValid(0);
entity.setIsAudit(0);
}
entity.setEditTime(new Date());
entity.setEditorId(entity.getCurrentUser().getId());
fileTransferCfgDao.updateCfgIndex(entity);
//无效子配置后，再新增子配置
// 删除无效子配置后，再新增子配置
fileTransferCfgDao.deleteP2pIpCfg(entity);
fileTransferCfgDao.deleteP2pHashCfg(entity);
fileTransferCfgDao.deleteP2pKeywordCfg(entity);
@@ -635,6 +643,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
areaIpCfgDao.deleteAreaIpCfg(area);
entity.setCreateTime(new Date());
entity.setCreatorId(entity.getCurrentUser().getId());
if(entity.getIpPortList()!=null){
for(IpPortCfg cfg:entity.getIpPortList()){
BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});