From 5197a63855837a18450e17c59b0fa231d1364b07 Mon Sep 17 00:00:00 2001 From: wangwei Date: Tue, 15 Jan 2019 21:56:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=A4=9A=E5=AA=92=E4=BD=93=E3=80=81=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=E6=8E=92=E5=BA=8F=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/basics/AsnIpCfg.java | 12 +-- .../domain/configuration/AvFileSampleCfg.java | 12 ++- .../com/nis/domain/configuration/BaseCfg.java | 4 +- .../nis/domain/configuration/BaseIpCfg.java | 4 +- .../domain/configuration/FileDigestCfg.java | 9 ++- .../configuration/AppCfgController.java | 16 ++-- .../BasicProtocolController.java | 16 ++-- .../EncryptedTunnelBehaviorController.java | 16 ++-- .../maintenance/DnsResStrategyController.java | 2 +- .../ntc/AvContentController.java | 32 ++++---- .../configuration/ntc/AvController.java | 44 ++++++++++- .../configuration/ntc/BgpCfgController.java | 16 ++-- .../ntc/FileTransferCfgController.java | 74 +++++++++++++++---- .../configuration/ntc/IpController.java | 16 ++-- .../configuration/ntc/MailCfgController.java | 16 ++-- .../configuration/ntc/WebsiteController.java | 49 ++++++------ .../ntc/WhiteListController.java | 16 ++-- .../proxy/PxyObjKeyringController.java | 4 +- 18 files changed, 240 insertions(+), 118 deletions(-) diff --git a/src/main/java/com/nis/domain/basics/AsnIpCfg.java b/src/main/java/com/nis/domain/basics/AsnIpCfg.java index 9e6a2324b..9517669d0 100644 --- a/src/main/java/com/nis/domain/basics/AsnIpCfg.java +++ b/src/main/java/com/nis/domain/basics/AsnIpCfg.java @@ -17,13 +17,13 @@ public class AsnIpCfg extends BaseCfg { @Expose private String ratelimit; @Expose - @ExcelField(title="ip_type",dictType="IP_TYPE",sort=3) + @ExcelField(title="ip_type",dictType="IP_TYPE",sort=6) @SerializedName("ipType") private Integer ipType; - @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6) + @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=8) private Integer ipPattern; private String srcIpAddress; - @ExcelField(title="server_ip",sort=5) + @ExcelField(title="ip",sort=7) private String destIpAddress; private Integer portPattern; private String srcPort; @@ -45,11 +45,11 @@ public class AsnIpCfg extends BaseCfg { private Integer protocol ; private Integer protocolId; - @ExcelField(title="organization",sort=91) + @ExcelField(title="organization",sort=2) private String organization; - @ExcelField(title="country",sort=92) + @ExcelField(title="country",sort=3) private String country; - @ExcelField(title="detail",sort=93) + @ExcelField(title="detail",sort=3) private String detail; private String userregion1; diff --git a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java index 1ae4d318c..82d74658d 100644 --- a/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java @@ -28,13 +28,23 @@ public class AvFileSampleCfg extends BaseCfg { @ExcelField(title="harm_level",sort=21) private Integer level; @Expose + @ExcelField(title="cfg_id",sort=0) @SerializedName("cfgId") private Integer compileId; private String srcPath; private String samplePath; private Integer isSampleCreated; private String resultPath; - + @ExcelField(title="log_total",sort=40) + private Long totalLogs; + + + public Long getTotalLogs() { + return totalLogs; + } + public void setTotalLogs(Long totalLogs) { + this.totalLogs = totalLogs; + } public String getSrcPath() { return srcPath; } diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 5bcd0eeda..e3d8d977d 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -119,13 +119,13 @@ public class BaseCfg extends BaseEntity implements Cloneable{ /** * 有效标识 */ - @ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=26) + @ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109) @Expose protected Integer isValid; /** * 是否审核 */ - @ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25) + @ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37) protected Integer isAudit; /** * 创建人员 diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 520b91f31..25d275cfb 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -45,11 +45,11 @@ public class BaseIpCfg extends BaseCfg { @SerializedName("ipType") @ExcelField(title="ip_type",dictType="IP_TYPE",sort=44) protected Integer ipType; - @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45) + @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=46) protected Integer ipPattern; @ExcelField(title="client_ip",sort=47) protected String srcIpAddress; - @ExcelField(title="server_ip",sort=46) + @ExcelField(title="ip",sort=45) protected String destIpAddress; @ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48) protected Integer portPattern; diff --git a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java index 57fef7b6d..7aee7e54a 100644 --- a/src/main/java/com/nis/domain/configuration/FileDigestCfg.java +++ b/src/main/java/com/nis/domain/configuration/FileDigestCfg.java @@ -37,6 +37,8 @@ public class FileDigestCfg extends BaseCfg { private Integer cfdsLevel; @ExcelField(title="file_url",sort=6) private String fileUrl; + @ExcelField(title="log_total",sort=40) + private Long totalLogs; private NtcSubscribeIdCfg ntcSubscribeIdCfg; private List ntcSubscribeIdCfgList; @@ -89,5 +91,10 @@ public class FileDigestCfg extends BaseCfg { public void setIndexTable(String indexTable) { this.indexTable = indexTable; } - + public Long getTotalLogs() { + return totalLogs; + } + public void setTotalLogs(Long totalLogs) { + this.totalLogs = totalLogs; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java index 41ed07f0b..4a24d7427 100644 --- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java @@ -1730,13 +1730,15 @@ public class AppCfgController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } // 查找社交应用的所有有效二级特定服务 SpecificServiceCfg second = new SpecificServiceCfg(); for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java index b55c6ed00..7c42deb20 100644 --- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java +++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java @@ -318,13 +318,15 @@ public class BasicProtocolController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); titleList.add("NTC_SUBSCRIBE_ID"); diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java index 375576e18..8c2666dfa 100644 --- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java +++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java @@ -331,13 +331,15 @@ public class EncryptedTunnelBehaviorController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } // 查找社交应用的所有有效二级特定服务 SpecificServiceCfg second = new SpecificServiceCfg(); for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index c87146bdd..b47a850f1 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -194,7 +194,7 @@ public class DnsResStrategyController extends BaseController { } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), DnsResStrategy.class); - String cfgIndexInfoNoExport = ",cfg_id,valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&config_describe:policy_name-"; + String cfgIndexInfoNoExport = ",cfg_id,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&config_describe:policy_name-"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index f32932cc9..66f128f2c 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -956,13 +956,15 @@ public class AvContentController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_STREAMING_MEDIA_URL"); @@ -1086,13 +1088,15 @@ public class AvContentController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 32baf47df..c353daa68 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -8,9 +8,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import java.util.UUID; import javax.servlet.http.HttpServletRequest; @@ -598,11 +600,41 @@ public class AvController extends BaseController { Page page = avCfgService.getAvFileSampleList(pageInfo, entity); ipLists = page.getList(); } - // 条件导出数据大于最大导出数，只导出最大导出条数 + //日志总量 + List> logTotals=new ArrayList>(); + StringBuilder compileIds=new StringBuilder(",");//配置ids + Set set=new HashSet();//服务ids + for (AvFileSampleCfg cfg : ipLists) { + if(cfg.getIsAudit()!=0){ + set.add(cfg.getServiceId()); + compileIds.append(cfg.getCompileId()+","); + }else{ + Map logTotal=new HashMap(); + logTotal.put("compileId", cfg.getCompileId()+""); + logTotal.put("sum",0L); + logTotals.add(logTotal); + } + + } + StringBuilder serviceIds=new StringBuilder(","); + for (Integer id : set) { + serviceIds.append(id+","); + } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } + + // 条件导出数据大于最大导出数，只导出最大导出条数 titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class); - String cfgIndexInfoNoExport = ",group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport = ",do_log,whether_area_block,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { @@ -619,6 +651,14 @@ public class AvController extends BaseController { } noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); + for (AvFileSampleCfg cfg : ipLists) { + for (Map logTotal : logTotals) { + if(cfg.getCompileId().equals(Integer.parseInt((String) logTotal.get("compileId")))){ + cfg.setTotalLogs((Long)logTotal.get("sum")); + break; + } + } + } dataMap.put(entity.getMenuNameCode(), ipLists); String timeRange = initTimeMap(entity); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java index 4c39b780a..1f8bc8129 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java @@ -220,13 +220,15 @@ public class BgpCfgController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.strIsBlank(serviceIdsStr)&&!StringUtils.strIsBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 2efa98d51..36311bd3e 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -645,13 +645,15 @@ public class FileTransferCfgController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_FTP_URL"); @@ -783,13 +785,15 @@ public class FileTransferCfgController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_P2P_KEYWORDS"); @@ -904,9 +908,39 @@ public class FileTransferCfgController extends BaseController { ipLists = page.getList(); } + //日志总量 + List> logTotals=new ArrayList>(); + StringBuilder compileIds=new StringBuilder(",");//配置ids + Set set=new HashSet();//服务ids + for (FileDigestCfg cfg : ipLists) { + if(cfg.getIsAudit()!=0){ + set.add(cfg.getServiceId()); + compileIds.append(cfg.getCompileId()+","); + }else{ + Map logTotal=new HashMap(); + logTotal.put("compileId", cfg.getCompileId()+""); + logTotal.put("sum",0L); + logTotals.add(logTotal); + } + + } + StringBuilder serviceIds=new StringBuilder(","); + for (Integer id : set) { + serviceIds.append(id+","); + } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } + titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), FileDigestCfg.class); - String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport = ",do_log,policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { @@ -922,7 +956,15 @@ public class FileTransferCfgController extends BaseController { cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport; } - noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); + noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); + for (FileDigestCfg cfg : ipLists) { + for (Map logTotal : logTotals) { + if(cfg.getCompileId().equals(Integer.parseInt((String) logTotal.get("compileId")))){ + cfg.setTotalLogs((Long)logTotal.get("sum")); + break; + } + } + } dataMap.put(entity.getMenuNameCode(), ipLists); /* } */ diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 3a02f7288..364f2b472 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -598,13 +598,15 @@ public class IpController extends BaseController{ for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); titleList.add("asn_policy"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java index b84ce9654..1cfd0cb4a 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java @@ -270,13 +270,15 @@ public class MailCfgController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String ipPortInfoNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index ac33ab721..fa02a7b73 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -648,13 +648,15 @@ public class WebsiteController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } // 条件导出数据大于最大导出数，只导出最大导出条数 String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; @@ -844,14 +846,15 @@ public class WebsiteController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); titleList.add("NTC_DNS_REGION"); @@ -975,13 +978,15 @@ public class WebsiteController extends BaseController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_SSL_SNI"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index d3c95732b..6a8fb2863 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -390,13 +390,15 @@ public class WhiteListController extends CommonController { for (Integer id : set) { serviceIds.append(id+","); } - String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); - String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); - //获取日志总量 - if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ - List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); - logTotals.addAll(logs); - } + if(serviceIds.length()>1&&compileIds.length()>1){ + String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); + String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); + //获取日志总量 + if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){ + List> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); + logTotals.addAll(logs); + } + } titleList.add(entity.getMenuNameCode()); titleList.add("NTC_IP"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 531c5fc9f..29829d2d1 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -420,7 +420,7 @@ public class PxyObjKeyringController extends BaseController { } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), PxyObjKeyring.class); - String cfgIndexInfoNoExport = ",config_describe,whether_area_block,block_type,valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; + String cfgIndexInfoNoExport = ",config_describe,whether_area_block,block_type,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) { @@ -485,7 +485,7 @@ public class PxyObjKeyringController extends BaseController { } titleList.add(entity.getMenuNameCode()); classMap.put(entity.getMenuNameCode(), PxyObjTrustedCaCert.class); - String cfgIndexInfoNoExport = ",whether_area_block,block_type,valid_identifier,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&config_describe:cert_name-"; + String cfgIndexInfoNoExport = ",whether_area_block,block_type,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,&config_describe:cert_name-"; // 时间过滤 if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {