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

批量下发功能增加，delRow.tag中暂时不打开此功能。

Browse Source 
app topic domain和app domain业务修改domain存储cfgkeyword属性。
摘要修改level属性存储为下发的最终数值。
同步的单域配置的增加时间和状态属性从entity中获取
This commit is contained in:
DuanDongmei
2018-12-05 17:56:41 +08:00
parent e5fa7cbca8
commit bb302e3f13
37 changed files with 2406 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,7 +432,11 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setRawLen(result.getData().getRawLen());
entity.setDigest(result.getData().getDigest());
entity.setFileUrl(result.getData().getAccessUrl());
if(!StringUtil.isEmpty(entity.getCfdsLevel()) && entity.getCfdsLevel() > 0) {
int cfdsLevel=entity.getCfdsLevel();
cfdsLevel= cfdsLevel > 10 ? (cfdsLevel/10):cfdsLevel;
entity.setCfdsLevel(cfdsLevel);
}
mailCfgDao.saveMailFileDigestCfg(entity);
// 保存SubscribeId域配置信息
@@ -454,7 +458,11 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}else{
if(!StringUtil.isEmpty(entity.getCfdsLevel()) && entity.getCfdsLevel() > 0) {
int cfdsLevel=entity.getCfdsLevel();
cfdsLevel= cfdsLevel > 10 ? (cfdsLevel/10):cfdsLevel;
entity.setCfdsLevel(cfdsLevel);
}
entity.setEditorId(entity.getCurrentUser().getId());
entity.setEditTime(new Date());
if(result.getData() !=null ) {
@@ -584,13 +592,6 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
Map<String,List> map = cfgConvert(digestRegionList,list,5,entity,groupRelationList);
groupRelationList=map.get("groupList");
digestRegionList=map.get("dstList");
if(!StringUtil.isEmpty(digestRegionList)){
for (DigestCfg digest : digestRegionList) {
if(!StringUtil.isEmpty(digest.getCfdsLevel()) && (digest.getCfdsLevel() > 1)){
digest.setCfdsLevel((int)(digest.getCfdsLevel()/10));
}
}
}
if(map.get("numRegionList")!=null){
numRegionList.addAll(map.get("numRegionList"));
}
@@ -657,7 +658,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
public FileDigestCfg getFileDigestSubIdCfg(Long cfgId,Integer compileId) {
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
if(entity.getCompileId()!=null){
if(entity != null && entity.getCompileId()!=null){
NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
ntcSubscribeIdCfg.setCompileId(entity.getCompileId());
List<NtcSubscribeIdCfg> ntcList = stringCfgDao.findSubscribeIdCfgList(ntcSubscribeIdCfg);