diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 2caf96bba..2e1747e48 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -384,6 +384,9 @@ public class ExcelCsv { String [] datas=data.split(","); for (String tag : datas) { StringBuffer sb = new StringBuffer(); + if("null".equals(tag.trim())){ + tag=null; + } if(StringUtils.isNotBlank(tag)){ // 替换值中双引号 if(tag.contains("\"")){ @@ -412,7 +415,7 @@ public class ExcelCsv { public static boolean isDate(String strDate) { 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])))))?$"); - if(strDate.length()>= 10){ + if(strDate.trim().length()>= 10){ String date=strDate.trim().substring(0, 10); Matcher m = pattern.matcher(date); if (m.matches()) { diff --git a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java index 4d249630d..9829ac4f8 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/CollectVoipLogController.java @@ -237,10 +237,6 @@ public class CollectVoipLogController extends BaseController { List serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); model.addAttribute("serviceList", serviceList); - // 获取字典信息 - List protocolList = CodeDicUtils.getCodeList("protocolCode"); - List behaviorList = CodeDicUtils.getCodeList("behaviorCode"); - List appList = CodeDicUtils.getCodeList("appCode"); String url = ""; url = Constants.LOG_BASE_URL + Constants.NTC_COLLECT_VOIP_LOG; String jsonString = HttpClientUtil.getMsg(url, params, request); diff --git a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java index e41572844..b0a5a645b 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java @@ -98,7 +98,6 @@ public class HttpLogController extends BaseController { @RequestMapping(value = "exportHttp") public void exportHttp(@ModelAttribute("log") NtcHttpLog log, Model model, String hColumns, String type, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) { - System.out.println("进来了http"); try { // export data info List titleList = new ArrayList(); @@ -137,7 +136,7 @@ public class HttpLogController extends BaseController { classMap.put("HTTP", NtcHttpLog.class); SysUser user = UserUtils.getUser(); 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 { hColumns += ","; } diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java index 4496b11ba..6f218bf97 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java @@ -175,7 +175,7 @@ public class NtcConnRecordLogController extends BaseController { } else { hColumns += ","; } - String cfgIndexInfoNoExport = "," + hColumns; + String cfgIndexInfoNoExport = ",cfg_id,action," + hColumns; noExportMap.put("conn_record", cfgIndexInfoNoExport); dataMap.put("conn_record", list); /* } */