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

1、界面配置转maat配置方法中增加文件摘要配置转换

Browse Source 
2、邮件配置审核增加摘要配置转换

Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-04 17:42:10 +08:00
parent 9ba7998f0c
commit 9206f064e7
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/domain/maat/MaatCfg.java
View File

@@ -419,7 +419,7 @@ public class MaatCfg implements Serializable {
@SerializedName("tableName")
private String cfgType;
@Expose
private Integer rawLen;
private Long rawLen;
@Expose
private String digest;
@Expose
@@ -446,10 +446,10 @@ public class MaatCfg implements Serializable {
public void setCfgType(String cfgType) {
this.cfgType = cfgType;
}
public Integer getRawLen() {
public Long getRawLen() {
return rawLen;
}
public void setRawLen(Integer rawLen) {
public void setRawLen(Long rawLen) {
this.rawLen = rawLen;
}
public String getDigest() {

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

@@ -362,6 +362,24 @@ public abstract class BaseService {
cfg.setIsValid(baseCfg.getIsValid());
dstList.add(cfg);
}
}else if(cfgType==5){
for(int i=0;i<srcList.size();i++){
com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg();
BeanUtils.copyProperties(srcList.get(i), cfg);
GroupCfg group = new GroupCfg();
if(!cfg.getCfgType().equals(regionValue)){
group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
group.setCompileId(baseCfg.getCompileId());
group.setAuditTime(baseCfg.getAuditTime());
group.setIsValid(baseCfg.getIsValid());
groupRelationList.add(group);
}
cfg.setGroupId(group.getGroupId());
cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
cfg.setAuditTime(baseCfg.getAuditTime());
cfg.setIsValid(baseCfg.getIsValid());
dstList.add(cfg);
}
}else{
dstList.addAll(srcList);
}

11
src/main/java/com/nis/web/service/configuration/MailCfgService.java
View File

@@ -259,6 +259,17 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
strRegionList=map.get("dstList");
}
}
if(entity.getDigestList()!=null && entity.getDigestList().size()>0){
FileDigestCfg cfg = new FileDigestCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
cfg.setTableName(FileDigestCfg.getTablename());
mailCfgDao.auditCfg(cfg);
if(isAudit==1){
Map<String,List> map = cfgConvert(digestRegionList,entity.getDigestList(),5,entity,groupRelationList);
groupRelationList=map.get("groupList");
digestRegionList=map.get("dstList");
}
}
//保存区域IP信息
if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
AreaIpCfg cfg = new AreaIpCfg();