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(",");
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()) {