Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml

@@ -56,24 +56,42 @@
             <version>1.18.10</version>
             <scope>compile</scope>
         </dependency>
-        <!--        excel导出-->
+
+    <!--excel 导入所需要的包        -->
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.6</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.1.0</version>
+            <version>3.17</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>4.2.4.RELEASE</version>
         </dependency>
+
+
+
+
         <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>9.0.30</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.2.0.BUILD-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>9.0.30</version>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.2.0.BUILD-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
 
     <build>

+package com.tianbo.util.ExcelUtils;
+
+
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * shenhailong
+ * 2020/4/27/14:29
+ */
+public class ExcelUtils {
+
+
+
+    /**
+     * 读取.xlsx 内容
+     * @param file
+     * @return
+     * @throws
+     */
+    public static List<ArrayList<String>> readXlsx (MultipartFile file) {
+        List<ArrayList<String>> list = new ArrayList<ArrayList<String>>();
+        InputStream input = null;
+        XSSFWorkbook wb = null;
+        try {
+            input = file.getInputStream();
+            //创建文档
+            wb = new XSSFWorkbook(input);
+            ArrayList<String> rowList = null;
+            int totoalRows = 0;//总行数
+            int totalCells = 0;//总列数
+            //读取sheet(页)
+            for (int sheetIndex = 0 ; sheetIndex < wb.getNumberOfSheets(); sheetIndex++) {
+                XSSFSheet xssfSheet = wb.getSheetAt(sheetIndex);
+
+                if (xssfSheet == null) {
+                    continue;
+                }
+                totoalRows = xssfSheet.getLastRowNum();
+                //读取row
+                for (int rowIndex = 2; rowIndex <= totoalRows; rowIndex++) {
+                    XSSFRow xssfRow = xssfSheet.getRow(rowIndex);
+
+                    if (xssfRow == null) {
+                        continue;
+                    }
+                    rowList = new ArrayList<String>();
+                    totalCells = xssfRow.getLastCellNum();
+
+                    //读取列
+                    for (int cellIndex = 0; cellIndex < totalCells; cellIndex++) {
+                        XSSFCell xssfCell = xssfRow.getCell(cellIndex);
+                        if (xssfCell == null) {
+                            rowList.add("");
+                        } else {
+//                            xssfCell.setCellType(Cell.CELL_TYPE_STRING);
+                            rowList.add(String.valueOf(xssfCell.getStringCellValue()));
+                        }
+                    }
+
+                    list.add(rowList);
+
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                if ( wb != null) {
+                    wb.close();
+                }
+                if (input != null) {
+                    input.close();
+                }
+            } catch (Exception e) {
+            }
+        }
+
+        return list;
+    }
+
+
+
+    /**
+     * 读取 .xls内容
+     * @param file
+     * @return
+     * @throws
+     */
+    public static List<ArrayList<String>> readXls (MultipartFile file)  {
+        List<ArrayList<String>> list = new ArrayList<ArrayList<String>>();
+
+        //创建输入流
+        InputStream input = null;
+        //创建文档
+        HSSFWorkbook wb = null;
+
+        try {
+            input = file.getInputStream();
+            //创建文档
+            wb = new HSSFWorkbook(input);
+
+            ArrayList<String> rowList = null;
+            int totoalRows = 0;//总行数
+            int totalCells = 0;//总列数
+            //读取sheet(页)
+            for (int sheetIndex = 0 ; sheetIndex < wb.getNumberOfSheets(); sheetIndex++) {
+                HSSFSheet hssfSheet = wb.getSheetAt(sheetIndex);
+
+                if (hssfSheet == null) {
+                    continue;
+                }
+
+                totoalRows = hssfSheet.getLastRowNum();
+                //读取row
+                for (int rowIndex = 2; rowIndex <= totoalRows; rowIndex++) {
+                    HSSFRow hssfRow = hssfSheet.getRow(rowIndex);
+
+                    if (hssfRow == null) {
+                        continue;
+                    }
+                    rowList = new ArrayList<String>();
+                    totalCells = hssfRow.getLastCellNum();
+
+                    //读取列
+                    for (int cellIndex = 0; cellIndex < totalCells; cellIndex++) {
+                        HSSFCell hssfCell = hssfRow.getCell(cellIndex);
+                        if (hssfCell == null) {
+                            rowList.add("");
+                        } else {
+                            hssfCell.setCellType(Cell.CELL_TYPE_STRING);
+                            rowList.add(String.valueOf(hssfCell.getStringCellValue()));
+                        }
+                    }
+
+                    list.add(rowList);
+
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                if ( wb != null) {
+//                    wb.close();
+                }
+                if (input != null) {
+                    input.close();
+                }
+            } catch (Exception e) {
+            }
+        }
+        return list;
+    }
+
+
+    public static String getPostfix (String path) {
+        if (StringUtils.isBlank(path) || !path.contains(".")) {
+            return null;
+        }
+        return path.substring(path.lastIndexOf(".") + 1, path.length()).trim();
+    }
+
+}

+package com.tianbo.util.WaybillUtils;
+
+/**
+ * shenhailong
+ * 2020/4/27/14:54
+ */
+public class WaybillUtils {
+
+
+    // 主单添加 - 符号
+    public String awb(String waybill){
+        String awb = "";
+        if (waybill.contains("-")) {
+            awb = waybill;
+        } else {
+            String s1 = waybill;
+            String substring = s1.substring(0, 3);
+            String substring1 = s1.substring(3);
+            awb = substring + "-" + substring1;
+        }
+        return awb;
+    }
+
+    // 判断是否符合模七校验
+    public boolean checkout(String waybill){
+
+        String[] split = waybill.split("-");
+
+        int number = Integer.parseInt(split[1]);
+
+        int start = number/10;
+
+        int remainder = start % 7;
+
+        int last = number % 10;
+
+        if (remainder!=last){
+            return false;
+        }else {
+            return true;
+        }
+
+    }
+
+}