Merge pull request #3 from Ryan-fai/dev

Dev

.gitignore

@@ -86,6 +86,7 @@ gradle-app.setting
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
+/.idea/
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/dictionaries

README.md

@@ -134,7 +134,10 @@ You can use "Basic" to let the parser automatically detect types
 
 Support all strings with format **HH:mm:ss** (directly out) or cell format **Time** (converted to a calander object and format with simple date format)
 
-> **Date** and **DateTIme** support would be added in future versions, add an issue if you need it.
+### Date Type
+Support string or numeric with format **yyyyMMdd** and it will format as **yyyy-MM-dd** in the json.
+
+> **DateTIme** support would be added in future versions, add an issue if you need it.
 
 ### Array Types
 

build.gradle

@@ -11,10 +11,10 @@ repositories {
 
 dependencies {
     // http://mvnrepository.com/artifact/org.apache.poi/poi
-    compile group: 'org.apache.poi', name: 'poi', version: '3.9'
+    compile group: 'org.apache.poi', name: 'poi', version: '4.1.0'
 
     // http://mvnrepository.com/artifact/org.apache.poi/poi-ooxml
-    compile group: 'org.apache.poi', name: 'poi-ooxml', version: '3.14'
+    compile group: 'org.apache.poi', name: 'poi-ooxml', version: '4.1.0'
 
     // http://mvnrepository.com/artifact/org.json/json
     compile group: 'org.json', name: 'json', version: '20160212'

src/main/java/moe/imvery/utils/xlsx2json/ExcelParser.java

@@ -1,21 +1,17 @@
 package moe.imvery.utils.xlsx2json;
 
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
 
-import static org.apache.poi.ss.usermodel.Cell.CELL_TYPE_BLANK;
-import static org.apache.poi.ss.usermodel.Cell.CELL_TYPE_STRING;
-
 /**
  * Created by Feliciano on 6/1/2016.
  */
@@ -88,7 +84,7 @@ public static Row findRowByColumn( ParsedSheet sheet, String key, String value)
                     if (cell == null)
                         continue;
 
-                    if (cell.getCellType() == CELL_TYPE_BLANK)
+                    if (cell.getCellType() == CellType.BLANK)
                         continue;
 
                     String cellValue = getCellStringValue(cell);
@@ -138,27 +134,28 @@ public static JSONObject parseRow(Row row, ParsedSheet parsedSheet) {
             switch (type) {
                 case BASIC:
                     // Handle "Null" string
-                    if (cell != null && cell.getCellType() == CELL_TYPE_STRING) {
+                    if (cell != null && cell.getCellType() == CellType.STRING) {
                         if (cell.getStringCellValue().equalsIgnoreCase("null")) {
                             jsonRow.put(key, JSONObject.NULL);
                             continue;
                         }
                     }
+                case DATE:
                 case TIME:
-                    if (cell != null && cell.getCellType() == CELL_TYPE_STRING) {
+                    if (cell != null && cell.getCellType() == CellType.STRING) {
                         if (cell.getStringCellValue().equalsIgnoreCase("null")) {
                             jsonRow.put(key, JSONObject.NULL);
                             continue;
                         }
                     }
                 case OBJECT:
-                    if (cell == null || cell.getCellType() == CELL_TYPE_BLANK) {
+                    if (cell == null || cell.getCellType() == CellType.BLANK) {
                         jsonRow.put(key, JSONObject.NULL);
                         continue;
                     }
                     break;
                 case REFERENCE:
-                    if (cell == null || cell.getCellType() == CELL_TYPE_BLANK) {
+                    if (cell == null || cell.getCellType() == CellType.BLANK) {
                         jsonRow.put(key.substring(0, key.indexOf("@")), JSONObject.NULL);
                         continue;
                     }
@@ -167,7 +164,7 @@ public static JSONObject parseRow(Row row, ParsedSheet parsedSheet) {
                 case ARRAY_STRING:
                 case ARRAY_BOOLEAN:
                 case ARRAY_DOUBLE:
-                    if (cell == null || cell.getCellType() == CELL_TYPE_BLANK) {
+                    if (cell == null || cell.getCellType() == CellType.BLANK) {
                         jsonRow.put(key, new ArrayList());
                         continue;
                     }
@@ -185,10 +182,10 @@ public static JSONObject parseRow(Row row, ParsedSheet parsedSheet) {
                 case ARRAY_DOUBLE:
                 {
                     switch (cell.getCellType()) {
-                        case Cell.CELL_TYPE_BOOLEAN:
+                        case BOOLEAN:
                             stringCellValue = String.valueOf(cell.getBooleanCellValue());
                             break;
-                        case Cell.CELL_TYPE_NUMERIC:
+                        case NUMERIC:
                             stringCellValue = String.valueOf(cell.getNumericCellValue());
                             break;
                         default:
@@ -203,10 +200,10 @@ public static JSONObject parseRow(Row row, ParsedSheet parsedSheet) {
                 case BASIC:
                     switch (cell.getCellType())
                     {
-                        case Cell.CELL_TYPE_NUMERIC:
+                        case NUMERIC:
                             jsonRow.put( key, cell.getNumericCellValue() );
                             break;
-                        case Cell.CELL_TYPE_BOOLEAN:
+                        case BOOLEAN:
                             jsonRow.put( key, cell.getBooleanCellValue() );
                             break;
                         default:
@@ -215,15 +212,44 @@ public static JSONObject parseRow(Row row, ParsedSheet parsedSheet) {
                     };
                     break;
 
+                case DATE:
+                    if(cell.getCellType() == CellType.NUMERIC){
+                        BigDecimal data = new BigDecimal(cell.getNumericCellValue()+"");
+                        String dateStr = data+"";
+                        Date date = null;
+                        if ((date=isValidDate(dateStr)) !=null){
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                            dateStr = sdf.format(date);
+                            jsonRow.put(key, dateStr);
+                        } else{
+                            jsonRow.put(key, "1990-01-01");
+                        }
+                    } else if(cell.getCellType() == CellType.STRING){
+                        String dateStr = cell.getStringCellValue();
+                        Date date = null;
+                        if ((date=isValidDate(dateStr)) !=null){
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                            dateStr = sdf.format(date);
+                            jsonRow.put(key, dateStr);
+                        } else{
+                            jsonRow.put(key, "1990-01-01");
+                        }
+                    } else {
+                        throw new IllegalArgumentException("Unhandled cell of " + cell.getCellType()+ " type at "
+                                + "row " + row.getRowNum()
+                                + "column " + index);
+                    }
+                    break;
+
                 case TIME:
-                    if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
+                    if (cell.getCellType() == CellType.NUMERIC) {
                         Date time = cell.getDateCellValue();
                         Calendar calendar = Calendar.getInstance();
                         calendar.setTime(time);
                         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
                         String timeStr = sdf.format(calendar.getTime());
                         jsonRow.put( key, timeStr );
-                    } else if (cell.getCellType() == Cell.CELL_TYPE_STRING){
+                    } else if (cell.getCellType() == CellType.STRING){
                         jsonRow.put( key, cell.getStringCellValue() );
                     } else {
                         throw new IllegalArgumentException("Unhandled cell of " + cell.getCellType()+ " type at "
@@ -284,13 +310,13 @@ public static JSONObject parseRow(Row row, ParsedSheet parsedSheet) {
 
     private static String getCellStringValue(Cell cell) {
         switch (cell.getCellType()) {
-            case CELL_TYPE_BLANK:
+            case BLANK:
                 break;
 
-            case Cell.CELL_TYPE_NUMERIC:
+            case NUMERIC:
                 return cell.getNumericCellValue() + "";
 
-            case Cell.CELL_TYPE_BOOLEAN:
+            case BOOLEAN:
                 return cell.getBooleanCellValue() + "";
 
             default:
@@ -300,6 +326,18 @@ private static String getCellStringValue(Cell cell) {
         return null;
     }
 
+    private static Date isValidDate(String dateStr){
+        Date date = null;
+        SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
+        try{
+            format.setLenient(false);
+            date = format.parse(dateStr);
+        }catch (ParseException e){
+            return null;
+        }
+        return date;
+    }
+
     /**
      * Parse a cell of the row
      * @param type The data type

src/main/java/moe/imvery/utils/xlsx2json/ParsedCellType.java

@@ -16,6 +16,10 @@ public enum ParsedCellType {
      * Time type format: hh:mm:ss
      */
     TIME("Time"),
+    /**
+     * Date type format: yyyyMMdd
+     */
+    DATE("Date"),
     /**
      * String array
      */