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

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

@@ -66,8 +66,8 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
page.setList(list);
return page;
}
public CfgIndexInfo getMailCfg(Long cfgId){
CfgIndexInfo entity = mailCfgDao.getCfgIndexInfo(cfgId);
public CfgIndexInfo getMailCfg(Long cfgId,Integer compileId){
CfgIndexInfo entity = mailCfgDao.getCfgIndexInfo(cfgId,compileId);
List<IpPortCfg> ipPortList = mailCfgDao.getIpPortList(entity);
List<ComplexkeywordCfg> keywordList = mailCfgDao.getMailKeywordList(entity);
List<FileDigestCfg> digestList = mailCfgDao.getMailFileDigestList(entity);
@@ -246,7 +246,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
entity.setFunctionId(functionId);
mailCfgDao.updateCfgValid(entity);
//查询子配置
entity = this.getMailCfg(Long.parseLong(id));
entity = this.getMailCfg(Long.parseLong(id),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -294,7 +294,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
List<IpCfg> areaIpRegionList = new ArrayList();
//查询子配置并修改审核状态
entity = this.getMailCfg(entity.getCfgId());
entity = this.getMailCfg(entity.getCfgId(),entity.getCompileId());
if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
IpPortCfg cfg = new IpPortCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});