修改

src/main/java/com/minpay/common/util/DateUtil.java

@@ -469,123 +469,6 @@ public class DateUtil {
 		return result;
 	}
 	
-	// 主函数
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		// 公共函数测试
-		String enddate="20170112150922";
-		System.out.println(enddate.substring(6, 14));
-//		Date date1 = new Date();
-//		Date date2 = new Date();
-//		System.out.println("date1=" + date1 + " date2=" + date2);
-//		System.out.println("isDateEqual(date1,date2)="
-//				+ isDateEqual(date1, date2));
-//		System.out.println(dateTimeCompare("20131009090910","20131009090909"));
-//		System.out.println(dateTimeCompare("20131109090909","20131009090909"));
-//		System.out.println("getCurrentDateString()=" + getCurrentDateString());
-//
-//		System.out.println("rollDate()=" + rollDate(new Date(), false));
-//
-//		String StartDate = "20060489";
-//		String EndDate = "20060403";
-//		Date start = String2Date(StartDate);
-//		Date end = String2Date(EndDate);
-//
-//		System.out.println("start=" + start + " end=" + end);
-//
-//		// 查询截止时间应在当天前的测试
-//		Date now = new Date(System.currentTimeMillis());
-//		String yestodayStr = rollDate(now, false);
-//		System.out.println(yestodayStr);
-//		Date yestoday = String2Date(yestodayStr);
-//		System.out.println(yestoday);
-//
-//		System.out.println("start=" + start + ";end=" + end + "now="
-//				+ getDayStart(now));
-//		if (start.after(getDayStart(now)) || isDateEqual(start, now))
-//			System.out.println("a");
-//		if ((!start.before(now)) || (!end.before(now))
-//				|| (isDateEqual(start, now)) || (isDateEqual(end, now))) {
-//			System.out.println("adsadfa");
-//		}
-//
-//		// 字符串匹配的测试
-//		Pattern p = Pattern
-//				.compile("([1-9]{1}[0-9]{3})(([0]{1}[1-9]{1})|([1]{1}[0-2]{1}))(([0]{1}[1-9]{1})|([1-2]{1}[0-9]{1})|([3]{1}[0-1]{1}))");
-//		Matcher m = p.matcher("19990131");
-//		boolean b = m.matches();
-//		System.out.println(b);
-//
-//		String bankSeqAndinputCode = "|adsfadsfa";
-//		System.out.println(bankSeqAndinputCode.indexOf('|'));
-//		String bankSeq = bankSeqAndinputCode.substring(0,
-//				bankSeqAndinputCode.indexOf('|'));
-//		String inputCode = bankSeqAndinputCode.substring(
-//				bankSeqAndinputCode.indexOf('|') + 1,
-//				bankSeqAndinputCode.length());
-//		System.out.println("bankSeq=" + bankSeq + " inputCode=" + inputCode);
-//
-//		Map map = new HashMap();
-//		map.put("name", "ldl");
-//		map.put("sex", "mail");
-//		map.put("age", "26");
-//
-//		// method1
-//		Iterator keyValuePairs1 = map.entrySet().iterator();
-//		for (int i = 0; i < map.size(); i++) {
-//			Map.Entry entry = (Map.Entry) keyValuePairs1.next();
-//			Object key = entry.getKey();
-//			Object value = entry.getValue();
-//			System.out.println("key[" + i + "]=" + key + " value[" + i + "]="
-//					+ value);
-//		}
-//		System.out.println();
-//
-//		// method2
-//		Object[] keyValuePairs2 = map.entrySet().toArray();
-//		for (int i = 0; i < map.size(); i++) {
-//			Map.Entry entry = (Map.Entry) keyValuePairs2[i];
-//			Object key = entry.getKey();
-//			Object value = entry.getValue();
-//			System.out.println("key[" + i + "]=" + key + " value[" + i + "]="
-//					+ value);
-//		}
-//		System.out.println();
-//
-//		// method3
-//		Iterator keyValuePairs3 = map.entrySet().iterator();
-//		int i = 0;
-//		while (keyValuePairs3.hasNext()) {
-//			i++;
-//			Map.Entry entry = (Map.Entry) keyValuePairs3.next();
-//			Object key = entry.getKey();
-//			Object value = entry.getValue();
-//			System.out.println("key[" + i + "]=" + key + " value[" + i + "]="
-//					+ value);
-//		}
-//		System.out.println();
-//
-//		// method4:error
-//		Iterator keyValuePairs4 = map.entrySet().iterator();
-//		for (Map.Entry entry = (Map.Entry) keyValuePairs4.next(); keyValuePairs4
-//				.hasNext(); entry = (Map.Entry) keyValuePairs4.next()) {
-//			Object key = entry.getKey();
-//			Object value = entry.getValue();
-//			System.out.println("key[" + i + "]=" + key + " value[" + i + "]="
-//					+ value);
-//		}
-//		System.out.println();
-//
-//		// 日期格式判断的测试
-//		System.out.println(isDateValid("20040229"));
-//		Properties p1 = new Properties();
-//		p1.setProperty("1", "2");
-//		System.out.println(p1.toString());
-	}
-	
 	/**
 	  * 
 	  * @Title: parseDate

src/main/java/com/minpay/common/util/FilesUtil.java

@@ -327,11 +327,13 @@ public class FilesUtil {
 		
 		for(int i=firstrow; i<rownum; i++){
 			Row row = sheet.getRow(i);
+			if (row == null) {
+				break;
+			}
 			Map<String,String> map = new HashMap<String,String>();
 			// 是否存在全为空的一行数据
 			boolean allIsNull = true;
 			for(int j=0; j<titleKey.length; j++){
-				System.out.println(i+":"+j);
 				Cell cell = row.getCell(j);
 				String cellValue="";
 				if(cell != null){