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

多域的日志增加可查看配置详情，隐藏日志中的查看详情，提供可以复制日志过长title功能

Browse Source
This commit is contained in:
zhanghongqing
2018-11-28 19:23:38 +08:00
parent 7ab1a38131
commit 1fbc899269
75 changed files with 869 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
page.setList(list);
return page;
}
public CfgIndexInfo getFtpCfg(Long cfgId){
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getFtpCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = fileTransferCfgDao.getIpPortList(entity);
List<BaseStringCfg> keywordList = fileTransferCfgDao.getFtpKeywordList(entity);
//设置关键字
@@ -233,7 +233,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setFunctionId(functionId);
fileTransferCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getFtpCfg(Long.parseLong(id));
entity = this.getFtpCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -282,7 +282,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getFtpCfg(entity.getCfgId());
entity = this.getFtpCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -401,8 +401,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
return page;
}
public FileDigestCfg getFileDigestCfg(Long cfgId){
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
public FileDigestCfg getFileDigestCfg(Long cfgId,Integer compileId){
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
List<NtcSubscribeIdCfg> subscribeidList = fileTransferCfgDao.getFileDigestSubscribeidList(entity);
entity.setNtcSubscribeIdCfgList(subscribeidList);
return entity;
@@ -526,7 +526,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setFunctionId(functionId);
fileTransferCfgDao.updateFileDigestCfg(entity);
entity = this.getFileDigestCfg(Long.parseLong(id));
entity = this.getFileDigestCfg(Long.parseLong(id),entity.getCompileId());
// 修改子域配置状态
if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
@@ -552,7 +552,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setAuditTime(auditTime);
fileTransferCfgDao.updateFileDigestCfg(entity);
entity = this.getFileDigestCfg(Long.parseLong(id));
entity = this.getFileDigestCfg(Long.parseLong(id),entity.getCompileId());
// 修改域配置审核状态
if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
@@ -655,8 +655,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
}
}
public FileDigestCfg getFileDigestSubIdCfg(Long cfgId) {
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
public FileDigestCfg getFileDigestSubIdCfg(Long cfgId,Integer compileId) {
FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
if(entity.getCompileId()!=null){
NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
ntcSubscribeIdCfg.setCompileId(entity.getCompileId());
@@ -675,9 +675,9 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
return page;
}
public CfgIndexInfo getP2pCfg(Long cfgId){
public CfgIndexInfo getP2pCfg(Long cfgId,Integer compileId){
// 查询各域配置信息
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId);
CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = fileTransferCfgDao.getIpPortList(entity);
List<P2pHashCfg> hashList = fileTransferCfgDao.getP2pHashList(entity);
List<P2pKeywordCfg> keywordList = fileTransferCfgDao.getP2pKeywordList(entity);
@@ -866,7 +866,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
entity.setFunctionId(functionId);
fileTransferCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getP2pCfg(Long.parseLong(id));
entity = this.getP2pCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -921,7 +921,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getP2pCfg(entity.getCfgId());
entity = this.getP2pCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});