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

修改配置导出多媒体、高级功能模块排序以及添加日志总量

Browse Source
This commit is contained in:
wangwei
2019-01-15 21:56:56 +08:00
parent b080a3fdbb
commit 5197a63855
18 changed files with 240 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/domain/basics/AsnIpCfg.java
View File

@@ -17,13 +17,13 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
@Expose @Expose
private String ratelimit; private String ratelimit;
@Expose @Expose
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3) @ExcelField(title="ip_type",dictType="IP_TYPE",sort=6)
@SerializedName("ipType") @SerializedName("ipType")
private Integer 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 Integer ipPattern;
private String srcIpAddress; private String srcIpAddress;
@ExcelField(title="server_ip",sort=5) @ExcelField(title="ip",sort=7)
private String destIpAddress; private String destIpAddress;
private Integer portPattern; private Integer portPattern;
private String srcPort; private String srcPort;
@@ -45,11 +45,11 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
private Integer protocol ; private Integer protocol ;
private Integer protocolId; private Integer protocolId;
@ExcelField(title="organization",sort=91) @ExcelField(title="organization",sort=2)
private String organization; private String organization;
@ExcelField(title="country",sort=92) @ExcelField(title="country",sort=3)
private String country; private String country;
@ExcelField(title="detail",sort=93) @ExcelField(title="detail",sort=3)
private String detail; private String detail;
private String userregion1; private String userregion1;

12
src/main/java/com/nis/domain/configuration/AvFileSampleCfg.java
View File

@@ -28,13 +28,23 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
@ExcelField(title="harm_level",sort=21) @ExcelField(title="harm_level",sort=21)
private Integer level; private Integer level;
@Expose @Expose
@ExcelField(title="cfg_id",sort=0)
@SerializedName("cfgId") @SerializedName("cfgId")
private Integer compileId; private Integer compileId;
private String srcPath; private String srcPath;
private String samplePath; private String samplePath;
private Integer isSampleCreated; private Integer isSampleCreated;
private String resultPath; 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() { public String getSrcPath() {
return srcPath; return srcPath;
} }

4
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -119,13 +119,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
/** /**
* 有效标识 * 有效标识
*/ */
@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=26) @ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109)
@Expose @Expose
protected Integer isValid; protected Integer isValid;
/** /**
* 是否审核 * 是否审核
*/ */
@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25) @ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37)
protected Integer isAudit; protected Integer isAudit;
/** /**
* 创建人员 * 创建人员

4
src/main/java/com/nis/domain/configuration/BaseIpCfg.java
View File

@@ -45,11 +45,11 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
@SerializedName("ipType") @SerializedName("ipType")
@ExcelField(title="ip_type",dictType="IP_TYPE",sort=44) @ExcelField(title="ip_type",dictType="IP_TYPE",sort=44)
protected Integer ipType; protected Integer ipType;
@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=45) @ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=46)
protected Integer ipPattern; protected Integer ipPattern;
@ExcelField(title="client_ip",sort=47) @ExcelField(title="client_ip",sort=47)
protected String srcIpAddress; protected String srcIpAddress;
@ExcelField(title="server_ip",sort=46) @ExcelField(title="ip",sort=45)
protected String destIpAddress; protected String destIpAddress;
@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48) @ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=48)
protected Integer portPattern; protected Integer portPattern;

9
src/main/java/com/nis/domain/configuration/FileDigestCfg.java
View File

@@ -37,6 +37,8 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
private Integer cfdsLevel; private Integer cfdsLevel;
@ExcelField(title="file_url",sort=6) @ExcelField(title="file_url",sort=6)
private String fileUrl; private String fileUrl;
@ExcelField(title="log_total",sort=40)
private Long totalLogs;
private NtcSubscribeIdCfg ntcSubscribeIdCfg; private NtcSubscribeIdCfg ntcSubscribeIdCfg;
private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList; private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -89,5 +91,10 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
public void setIndexTable(String indexTable) { public void setIndexTable(String indexTable) {
this.indexTable = indexTable; this.indexTable = indexTable;
} }
public Long getTotalLogs() {
return totalLogs;
}
public void setTotalLogs(Long totalLogs) {
this.totalLogs = totalLogs;
}
} }

16
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -1730,13 +1730,15 @@ public class AppCfgController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
// 查找社交应用的所有有效二级特定服务 // 查找社交应用的所有有效二级特定服务
SpecificServiceCfg second = new SpecificServiceCfg(); SpecificServiceCfg second = new SpecificServiceCfg();
for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {

16
src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java
View File

@@ -318,13 +318,15 @@ public class BasicProtocolController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP"); titleList.add("NTC_IP");
titleList.add("NTC_SUBSCRIBE_ID"); titleList.add("NTC_SUBSCRIBE_ID");

16
src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
View File

@@ -331,13 +331,15 @@ public class EncryptedTunnelBehaviorController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
// 查找社交应用的所有有效二级特定服务 // 查找社交应用的所有有效二级特定服务
SpecificServiceCfg second = new SpecificServiceCfg(); SpecificServiceCfg second = new SpecificServiceCfg();
for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) { for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {

2
src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
View File

@@ -194,7 +194,7 @@ public class DnsResStrategyController extends BaseController {
} }
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), DnsResStrategy.class); 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) { if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {

32
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -956,13 +956,15 @@ public class AvContentController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_UNIVERSAL_IP");
titleList.add("NTC_STREAMING_MEDIA_URL"); titleList.add("NTC_STREAMING_MEDIA_URL");
@@ -1086,13 +1088,15 @@ public class AvContentController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_UNIVERSAL_IP");

44
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -8,9 +8,11 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -598,11 +600,41 @@ public class AvController extends BaseController {
Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(pageInfo, entity); Page<AvFileSampleCfg> page = avCfgService.getAvFileSampleList(pageInfo, entity);
ipLists = page.getList(); ipLists = page.getList();
} }
// 条件导出数据大于最大导出数，只导出最大导出条数
//日志总量
List<Map<String,Object>> logTotals=new ArrayList<Map<String,Object>>();
StringBuilder compileIds=new StringBuilder(",");//配置ids
Set<Integer> set=new HashSet<Integer>();//服务ids
for (AvFileSampleCfg cfg : ipLists) {
if(cfg.getIsAudit()!=0){
set.add(cfg.getServiceId());
compileIds.append(cfg.getCompileId()+",");
}else{
Map<String,Object> logTotal=new HashMap<String,Object>();
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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
logTotals.addAll(logs);
}
}
// 条件导出数据大于最大导出数，只导出最大导出条数
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), AvFileSampleCfg.class); 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) { 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); noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport);
for (AvFileSampleCfg cfg : ipLists) {
for (Map<String,Object> logTotal : logTotals) {
if(cfg.getCompileId().equals(Integer.parseInt((String) logTotal.get("compileId")))){
cfg.setTotalLogs((Long)logTotal.get("sum"));
break;
}
}
}
dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put(entity.getMenuNameCode(), ipLists);
String timeRange = initTimeMap(entity); String timeRange = initTimeMap(entity);

16
src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
View File

@@ -220,13 +220,15 @@ public class BgpCfgController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1); 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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());

74
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -645,13 +645,15 @@ public class FileTransferCfgController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_UNIVERSAL_IP");
titleList.add("NTC_FTP_URL"); titleList.add("NTC_FTP_URL");
@@ -783,13 +785,15 @@ public class FileTransferCfgController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_UNIVERSAL_IP");
titleList.add("NTC_P2P_KEYWORDS"); titleList.add("NTC_P2P_KEYWORDS");
@@ -904,9 +908,39 @@ public class FileTransferCfgController extends BaseController {
ipLists = page.getList(); ipLists = page.getList();
} }
//日志总量
List<Map<String,Object>> logTotals=new ArrayList<Map<String,Object>>();
StringBuilder compileIds=new StringBuilder(",");//配置ids
Set<Integer> set=new HashSet<Integer>();//服务ids
for (FileDigestCfg cfg : ipLists) {
if(cfg.getIsAudit()!=0){
set.add(cfg.getServiceId());
compileIds.append(cfg.getCompileId()+",");
}else{
Map<String,Object> logTotal=new HashMap<String,Object>();
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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), FileDigestCfg.class); 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) { 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; cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport;
} }
noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport);
for (FileDigestCfg cfg : ipLists) {
for (Map<String,Object> logTotal : logTotals) {
if(cfg.getCompileId().equals(Integer.parseInt((String) logTotal.get("compileId")))){
cfg.setTotalLogs((Long)logTotal.get("sum"));
break;
}
}
}
dataMap.put(entity.getMenuNameCode(), ipLists); dataMap.put(entity.getMenuNameCode(), ipLists);
/* } */ /* } */

16
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -598,13 +598,15 @@ public class IpController extends BaseController{
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP"); titleList.add("NTC_IP");
titleList.add("asn_policy"); titleList.add("asn_policy");

16
src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
View File

@@ -270,13 +270,15 @@ public class MailCfgController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
String ipPortInfoNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator" String ipPortInfoNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"

49
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -648,13 +648,15 @@ public class WebsiteController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
// 条件导出数据大于最大导出数，只导出最大导出条数 // 条件导出数据大于最大导出数，只导出最大导出条数
String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,"; String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
@@ -844,14 +846,15 @@ public class WebsiteController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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)){ if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
logTotals.addAll(logs); logTotals.addAll(logs);
} }
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP"); titleList.add("NTC_IP");
titleList.add("NTC_DNS_REGION"); titleList.add("NTC_DNS_REGION");
@@ -975,13 +978,15 @@ public class WebsiteController extends BaseController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_UNIVERSAL_IP"); titleList.add("NTC_UNIVERSAL_IP");
titleList.add("NTC_SSL_SNI"); titleList.add("NTC_SSL_SNI");

16
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -390,13 +390,15 @@ public class WhiteListController extends CommonController {
for (Integer id : set) { for (Integer id : set) {
serviceIds.append(id+","); serviceIds.append(id+",");
} }
String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1); if(serviceIds.length()>1&&compileIds.length()>1){
String compileIdsStr=compileIds.toString().substring(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<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr); if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
logTotals.addAll(logs); List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
} logTotals.addAll(logs);
}
}
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
titleList.add("NTC_IP"); titleList.add("NTC_IP");

4
src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java
View File

@@ -420,7 +420,7 @@ public class PxyObjKeyringController extends BaseController {
} }
titleList.add(entity.getMenuNameCode()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), PxyObjKeyring.class); 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) { 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()); titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), PxyObjTrustedCaCert.class); 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) { if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {