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

日志查询导出字段过滤

Browse Source 
导出csv null过滤
This commit is contained in:
leijun
2018-12-17 04:13:02 +08:00
parent 997ddfc516
commit f11f1186b5
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/util/excel/ExcelCsv.java
View File

@@ -384,6 +384,9 @@ public class ExcelCsv {
String [] datas=data.split(","); String [] datas=data.split(",");
for (String tag : datas) { for (String tag : datas) {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
if("null".equals(tag.trim())){
tag=null;
}
if(StringUtils.isNotBlank(tag)){ if(StringUtils.isNotBlank(tag)){
// 替换值中双引号 // 替换值中双引号
if(tag.contains("\"")){ if(tag.contains("\"")){
@@ -412,7 +415,7 @@ public class ExcelCsv {
public static boolean isDate(String strDate) { public static boolean isDate(String strDate) {
Pattern pattern = Pattern Pattern pattern = Pattern
.compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$"); .compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
if(strDate.length()>= 10){ if(strDate.trim().length()>= 10){
String date=strDate.trim().substring(0, 10); String date=strDate.trim().substring(0, 10);
Matcher m = pattern.matcher(date); Matcher m = pattern.matcher(date);
if (m.matches()) { if (m.matches()) {

4
src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java
View File

@@ -237,10 +237,6 @@ public class CollectVoipLogController extends BaseController {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList); model.addAttribute("serviceList", serviceList);
// 获取字典信息
List<CodeResult> protocolList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> behaviorList = CodeDicUtils.getCodeList("behaviorCode");
List<CodeResult> appList = CodeDicUtils.getCodeList("appCode");
String url = ""; String url = "";
url = Constants.LOG_BASE_URL + Constants.NTC_COLLECT_VOIP_LOG; url = Constants.LOG_BASE_URL + Constants.NTC_COLLECT_VOIP_LOG;
String jsonString = HttpClientUtil.getMsg(url, params, request); String jsonString = HttpClientUtil.getMsg(url, params, request);

3
src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java
View File

@@ -98,7 +98,6 @@ public class HttpLogController extends BaseController {
@RequestMapping(value = "exportHttp") @RequestMapping(value = "exportHttp")
public void exportHttp(@ModelAttribute("log") NtcHttpLog log, Model model, String hColumns, String type, public void exportHttp(@ModelAttribute("log") NtcHttpLog log, Model model, String hColumns, String type,
HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) { HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
System.out.println("进来了http");
try { try {
// export data info // export data info
List<String> titleList = new ArrayList<String>(); List<String> titleList = new ArrayList<String>();
@@ -137,7 +136,7 @@ public class HttpLogController extends BaseController {
classMap.put("HTTP", NtcHttpLog.class); classMap.put("HTTP", NtcHttpLog.class);
SysUser user = UserUtils.getUser(); SysUser user = UserUtils.getUser();
if (!user.isAdmin()) { if (!user.isAdmin()) {
hColumns += ",scene_file,"; hColumns += ",req_hdr_key,req_hdr_file,req_body_key,req_body_file,res_hdr_key,res_hdr_file,res_body_key,res_body_file,scene_file,";
} else { } else {
hColumns += ","; hColumns += ",";
} }

2
src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
View File

@@ -175,7 +175,7 @@ public class NtcConnRecordLogController extends BaseController {
} else { } else {
hColumns += ","; hColumns += ",";
} }
String cfgIndexInfoNoExport = "," + hColumns; String cfgIndexInfoNoExport = ",cfg_id,action," + hColumns;
noExportMap.put("conn_record", cfgIndexInfoNoExport); noExportMap.put("conn_record", cfgIndexInfoNoExport);
dataMap.put("conn_record", list); dataMap.put("conn_record", list);
/* } */ /* } */