diff --git a/build.gradle b/build.gradle
index 1cebfea..6166542 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,6 @@ mainClassName = 'com.taover.util.UtilString'
 
 dependencies {
 	compile(
-		"org.apache.poi:poi:4.1.2",
-		"org.apache.poi:poi-excelant:4.1.2",
 		"ch.ethz.ganymed:ganymed-ssh2:build210",
 		"org.apache.velocity:velocity:1.6.4",
 		"com.squareup.okhttp3:okhttp:3.14.1",
@@ -62,7 +60,7 @@ uploadArchives {
                 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
             }
             pom.project {
-                version '1.1.124'
+                version '1.2.1'
                 artifactId ARTIFACT_Id
                 groupId GROUP_ID
                 packaging TYPE
diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java
deleted file mode 100644
index e635766..0000000
--- a/src/main/java/com/taover/util/UtilExcel.java
+++ /dev/null
@@ -1,576 +0,0 @@
-package com.taover.util;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.openxml4j.util.ZipSecureFile;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.FillPatternType;
-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.WorkbookFactory;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-@Deprecated
-public class UtilExcel {
-	private final static String excel2003L =".xls";    //2003- 版本的excel  
-    private final static String excel2007U =".xlsx";   //2007+ 版本的excel
-    private final static String CSV =".csv";   //csv
-    
-    private final static int maxExcelRowNum = 10000;
-    private final static int maxExcelColumnNum = 100;
-    
-    static {
-    	ZipSecureFile.setMinInflateRatio(-1.0d);
-    }
-    
-    /** 
-     * 描述：根据文件后缀，自适应上传文件的版本  
-     * @param inStr,fileName 
-     * @return 
-     * @throws Exception 
-     */  
-    private static Workbook getWorkbook(String filePath, boolean isRead) throws Exception{  
-        Workbook wb = null;
-        File tempFile = null;
-        if(isRead){
-        	tempFile = new File(filePath);
-    		if(!tempFile.exists()){
-    			throw new Exception("需要读取的文件不存在!");
-    		}
-        }
-        if(isRead) {
-        	wb = WorkbookFactory.create(tempFile);
-        }else {
-        	int dotIndex = filePath.lastIndexOf(".");
-        	if(dotIndex < 0) {
-        		throw new Exception("传入的文件没有指定扩展名");
-        	}
-        	String filteTypeLower = filePath.substring(dotIndex).trim().toLowerCase();
-        	if(excel2003L.equals(filteTypeLower) || CSV.equals(filteTypeLower)){
-            	wb = new HSSFWorkbook();  //2003-
-            } else if (excel2007U.equals(filteTypeLower)){
-            	wb = new XSSFWorkbook();  //2007+
-            } else {  
-                throw new Exception("解析的文件格式有误！");  
-            }
-        }
-        return wb;  
-    }
-    
-    /**
-	 * 创建并保存excel表
-	 * @param sheetName
-	 * @param data
-	 * @param path
-	 */
-	public static File saveExcelFromListString(String sheetName, List<String[]> data, String path) throws Exception{
-		Workbook wb = UtilExcel.getWorkbook(path, false);
-		//创建Excel工作簿对象
-		Sheet sheet = wb.createSheet(sheetName);//创建Excel工作表对象
-		for(int i=0; i<data.size(); ++i){
-			Row row = sheet.createRow(i); //创建Excel工作表的行
-			String[] dataRow = data.get(i);
-			if(dataRow != null){
-				for(int j=0; j<dataRow.length; ++j){
-					Cell cell = row.createCell(j);
-					String dataCell = dataRow[j];
-					if(dataCell != null){
-						cell.setCellValue(dataCell);
-					}				
-				}	
-			}			
-		}		
-		try {
-			FileOutputStream fileOut;
-			File tempFile = new File(path);
-			if(!tempFile.exists()){
-				File parentFile = tempFile.getParentFile();
-				if(!parentFile.exists()){
-					parentFile.mkdirs();	
-				}				
-				if(!tempFile.createNewFile()){
-					return null;
-				}
-			}
-			fileOut = new FileOutputStream(tempFile);
-			wb.write(fileOut);
-			wb.close();
-			fileOut.close();
-			
-			return tempFile;
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return null;
-	}
-    
-	/**
-	 * 创建并保存excel表
-	 * @param sheetName
-	 * @param data
-	 * @param path
-	 */
-	public static void saveExcel(String sheetName, List<List<Object>> data, String path) throws Exception{
-		Workbook wb = UtilExcel.getWorkbook(path, false);
-		//创建Excel工作簿对象
-		Sheet sheet = wb.createSheet(sheetName);//创建Excel工作表对象
-		for(int i=0; i<data.size(); ++i){
-			Row row = sheet.createRow(i); //创建Excel工作表的行
-			List<Object> dataRow = data.get(i);
-			if(dataRow != null){
-				for(int j=0; j<dataRow.size(); ++j){
-					Cell cell = row.createCell(j);
-					Object dataCell = dataRow.get(j);
-					setCellValue(cell, dataCell);
-				}	
-			}			
-		}		
-		try {
-			FileOutputStream fileOut;
-			File tempFile = new File(path);
-			if(!tempFile.exists()){
-				File parentFile = tempFile.getParentFile();
-				if(!parentFile.exists()){
-					parentFile.mkdirs();	
-				}				
-				if(!tempFile.createNewFile()){
-					return;
-				}
-			}
-			fileOut = new FileOutputStream(tempFile);
-			wb.write(fileOut);
-			wb.close();
-			fileOut.close();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}		
-	}
-	
-	private static void setCellValue(Cell cell, Object data) {
-		if(data != null){
-			if(ClassUtil.isBasicType(data.getClass())){
-				cell.setCellValue(Double.valueOf(data.toString()));
-			}else if(data.getClass().getSimpleName().equals("Date")){
-				cell.setCellValue((Date)data);	
-			}else{
-				cell.setCellValue(data.toString());
-			}	
-		}
-	}
-	
-	/**
-	 * 创建并保存excel表 sheet
-	 * @param sheetName
-	 * @param data
-	 * @param path
-	 */
-	public static void saveExcelContailSheet(List<String> sheetList, List<List<List<Object>>> dataList, String path) throws Exception{
-		if(sheetList.size() != dataList.size()){
-			throw new Exception("sheet size != excel size");
-		}
-		Workbook wb = UtilExcel.getWorkbook(path, false);
-		//创建Excel工作簿对象
-		
-		for (int j = 0;j< dataList.size(); j++) {
-			List<List<Object>> data = dataList.get(j);
-			Sheet sheet = wb.createSheet(sheetList.get(j));//创建Excel工作表对象
-			for(int i=0; i<data.size(); ++i){
-				Row row = sheet.createRow(i); //创建Excel工作表的行
-				List<Object> dataRow = data.get(i);
-				if(dataRow != null){
-					for(int k=0; k<dataRow.size(); ++k){
-						Cell cell = row.createCell(k);
-						Object dataCell = dataRow.get(k);
-						setCellValue(cell, dataCell);
-					}	
-				}			
-			}		
-		}
-		
-		try {
-			FileOutputStream fileOut;
-			File tempFile = new File(path);
-			if(!tempFile.exists()){
-				File parentFile = tempFile.getParentFile();
-				if(!parentFile.exists()){
-					parentFile.mkdirs();	
-				}				
-				if(!tempFile.createNewFile()){
-					return;
-				}
-			}
-			fileOut = new FileOutputStream(tempFile);
-			wb.write(fileOut);
-			wb.close();
-			fileOut.close();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}		
-	}
-	
-	/**
-	 * 创建并保存excel表
-	 * @param sheetName
-	 * @param data
-	 * @param path
-	 */
-	public static void saveExcel(String sheetName, List<List<Object>> data, String path, List<Short> backColorList) throws Exception{
-		Workbook wb = UtilExcel.getWorkbook(path, false);
-		Map<Short, CellStyle> cellStyleMap = new HashMap<Short, CellStyle>();
-		Sheet sheet = wb.createSheet(sheetName);//创建Excel工作表对象
-		for(int i=0; i<data.size(); ++i){
-			Row row = sheet.createRow(i); //创建Excel工作表的行
-			List<Object> dataRow = data.get(i);
-			Short backColor = backColorList.get(i);
-			CellStyle style = cellStyleMap.get(backColor);
-			if(style == null){
-				style = wb.createCellStyle();
-				style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-				cellStyleMap.put(backColor, style);
-			}
-			if(backColor != null){
-				style.setFillForegroundColor(backColor.shortValue());
-			}
-			if(dataRow != null){
-				for(int j=0; j<dataRow.size(); ++j){
-					Cell cell = row.createCell(j);
-					Object dataCell = dataRow.get(j);					
-					setCellValue(cell, dataCell);
-					if(backColor != null){
-						cell.setCellStyle(style);	
-					}
-				}	
-			}			
-		}		
-		try {
-			FileOutputStream fileOut;
-			File tempFile = new File(path);
-			if(!tempFile.exists()){
-				File parentFile = tempFile.getParentFile();
-				if(!parentFile.exists()){
-					parentFile.mkdirs();	
-				}				
-				if(!tempFile.createNewFile()){
-					return;
-				}
-			}
-			fileOut = new FileOutputStream(tempFile);
-			wb.write(fileOut);
-			wb.close();
-			fileOut.close();
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}		
-	}
-	
-	/**
-	 * 读取excel表--当前激活的工作表
-	 * @param path
-	 */
-	public static List<List<Object>> readExcel(String filepath) throws Exception{
-		File file = new File(filepath);
-		if(!file.exists()){
-			throw new Exception("Excel["+filepath+"]文件不存在");
-		}
-		Workbook wb = UtilExcel.getWorkbook(filepath, true);
-		return readExcelBySheetIndex(wb, wb.getActiveSheetIndex());
-	}
-	
-	/**
-	 * 读取excel表--当前激活的工作表
-	 * @param path
-	 */
-	public static List<List<Object>> readExcel(String filepath, boolean hasLimit) throws Exception{
-		File file = new File(filepath);
-		if(!file.exists()){
-			throw new Exception("Excel["+filepath+"]文件不存在");
-		}
-		Workbook wb = UtilExcel.getWorkbook(filepath, true);
-		return readExcelBySheetIndex(wb, wb.getActiveSheetIndex(), hasLimit);
-	}
-	
-	/**
-	 * 读取
-	 * @param filepath
-	 * @return
-	 * @throws Exception
-	 */
-	public static List<List<Object>> readExcelExcludeHideLine(String filepath) throws Exception{
-		File file = new File(filepath);
-		if(!file.exists()){
-			throw new Exception("Excel["+filepath+"]文件不存在");
-		}
-		Workbook wb = UtilExcel.getWorkbook(filepath, true);
-		return readExcelBySheetIndexExcludeHideLine(filepath, wb.getActiveSheetIndex());
-	}
-	
-	/**
-	 * 读取excel表--所有工作表
-	 * @param path
-	 */
-	public static List<List<Object>> readExcelAllSheet(String filepath) throws Exception{
-		File file = new File(filepath);
-		List<List<Object>> result = new ArrayList<List<Object>>();
-		if(!file.exists()){
-			throw new Exception("Excel["+filepath+"]文件不存在");
-		}
-		Workbook wb = UtilExcel.getWorkbook(filepath, true);		
-		int sheetNumber = wb.getNumberOfSheets();
-		
-		for(int sheetIndex=0; sheetIndex<sheetNumber; ++sheetIndex){
-			result.addAll(readExcelBySheetIndex(filepath, sheetIndex));
-		}
-		
-		return result;
-	}
-	
-	
-	/**
-	 * 读取excel表--所有工作表 Map封装
-	 * @param path
-	 */
-	public static Map<String,List<List<Object>>> readExcelAllSheetMap(String filepath) throws Exception{
-		File file = new File(filepath);
-		HashMap<String, List<List<Object>>> map = new HashMap<String,List<List<Object>>>();
-		if(!file.exists()){
-			throw new Exception("Excel["+filepath+"]文件不存在");
-		}
-		Workbook wb = UtilExcel.getWorkbook(filepath, true);		
-		int sheetNumber = wb.getNumberOfSheets();
-		
-		for(int sheetIndex=0; sheetIndex<sheetNumber; ++sheetIndex){
-			map.put(sheetIndex+"",(readExcelBySheetIndexExcludeHideLine(filepath, sheetIndex)));
-		}
-		
-		return map;
-	}
-	
-	
-
-	/**
-	 * 读取excel表--当前激活的工作表
-	 * @param path
-	 */
-	public static List<List<Object>> readExcelBySheetIndex(String filepath, int sheetIndex) throws Exception{
-		File file = new File(filepath);
-		if(!file.exists()){
-			throw new Exception("Excel["+filepath+"]文件不存在");
-		}
-		Workbook wb = UtilExcel.getWorkbook(filepath, true);  
-		Sheet sheet = wb.getSheetAt(sheetIndex);
-		return readExcelBySheet(sheet, UtilExcel.maxExcelRowNum, false);
-	}
-	
-	private static List<List<Object>> readExcelBySheetIndex(Workbook wb, int sheetIndex) throws Exception{
-		return readExcelBySheetIndex(wb, sheetIndex, true);
-	}
-	
-	private static List<List<Object>> readExcelBySheetIndex(Workbook wb, int sheetIndex, boolean hasRowLimit) throws Exception{  
-		Sheet sheet = wb.getSheetAt(sheetIndex);
-		if(hasRowLimit){
-			return readExcelBySheet(sheet, UtilExcel.maxExcelRowNum, false);	
-		}else {
-			return readExcelBySheet(sheet, Integer.MAX_VALUE, false);
-		}
-	}
-	
-	/**
-	 * 读取excel表--当前激活的工作表
-	 * @param path
-	 */
-	private static List<List<Object>> readExcelBySheet(Sheet sheet, int rowLimit, boolean excludeRowZeroHeight) throws Exception{
-		List<List<Object>> result = new ArrayList<List<Object>>();
-		int start = sheet.getFirstRowNum();
-		int end = sheet.getLastRowNum();
-		if(end > rowLimit){
-			end = rowLimit;
-		}
-		DecimalFormat df = new DecimalFormat("0.####");
-		for(int i=start; i<end+1; ++i){
-			Row row = sheet.getRow(i);
-			if(row == null){
-				continue;
-			}
-			//去除隐藏行
-			if(excludeRowZeroHeight && row.getZeroHeight()){
-				continue;
-			}
-			List<Object> dataRow = new ArrayList<Object>();
-			int lastCellNum = row.getLastCellNum();
-			if(lastCellNum > UtilExcel.maxExcelColumnNum){
-				lastCellNum = UtilExcel.maxExcelColumnNum;
-			}
-			for(int j=0; j<lastCellNum; ++j){
-				try {
-					dataRow.add(getCellValue(row.getCell(j), df));
-				}catch(Exception e) {
-					dataRow.add("");
-					e.printStackTrace();
-				}
-			}
-			result.add(dataRow);
-		}
-		return result;
-	}
-	
-	private static Object getCellValue(Cell cell, DecimalFormat df) {
-		if(cell == null) {
-			return "";
-		}
-		CellType currCellType = cell.getCellTypeEnum();
-		
-		if(currCellType.compareTo(CellType.STRING) == 0){
-			return UtilString.trimCodePage(cell.getRichStringCellValue().getString());	
-		}else if(currCellType.compareTo(CellType.NUMERIC) == 0){
-			
-			/**
-			 * yyyy-MM-dd----- 14
-				yyyy年m月d日---    31
-				yyyy年m月-------  57
-				m月d日  ----------    58
-				HH:mm-----------    20
-				h时mm分  -------  32
-				yyyy-MM-dd HH:hh:ss 22
-			 */
-			short format = cell.getCellStyle().getDataFormat();
-			if (DateUtil.isCellDateFormatted(cell)) {
-            	SimpleDateFormat sdf = null;  
-                if(format == 14 || format == 31 || format == 57 || format == 58 ){  
-                    //日期  
-                    sdf = new SimpleDateFormat("yyyy-MM-dd");  
-                }else if (format == 20 || format == 32) {  
-                    //时间  
-                    sdf = new SimpleDateFormat("HH:mm");  
-                }else {
-                	sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");  
-                }
-                double value = cell.getNumericCellValue();  
-                Date date = org.apache.poi.ss.usermodel.DateUtil.getJavaDate(value);  
-                return sdf.format(date);  
-            } else {
-            	return df.format(cell.getNumericCellValue());
-            }
-            
-		}else if(currCellType.compareTo(CellType.BOOLEAN) == 0){
-			return cell.getBooleanCellValue();
-		}else if(currCellType.compareTo(CellType.FORMULA) == 0){
-			return getFormulatValue(cell, df);
-		}
-		return "";
-	}
-	
-	private static Object getFormulatValue(Cell cell, DecimalFormat df) {
-		CellType formulatResultType = cell.getCachedFormulaResultTypeEnum();
-		
-		if(formulatResultType.compareTo(CellType.STRING) == 0){
-			return UtilString.trimCodePage(cell.getRichStringCellValue().getString());	
-		}else if(formulatResultType.compareTo(CellType.NUMERIC) == 0){
-			return df.format(cell.getNumericCellValue());
-		}else if(formulatResultType.compareTo(CellType.BOOLEAN) == 0){
-			return cell.getBooleanCellValue();
-		}else if(formulatResultType.compareTo(CellType.FORMULA) == 0){
-			return "";
-		}
-		return "";
-	}
-	
-	public static List<List<Object>> readExcelBySheetIndexExcludeHideLine(String filepath, int sheetIndex) throws Exception{
-		File file = new File(filepath);
-		if(!file.exists()){
-			throw new Exception("Excel文件["+filepath+"]不存在");
-		}
-		Workbook wb = UtilExcel.getWorkbook(filepath, true); 
-		Sheet sheet = wb.getSheetAt(sheetIndex);
-		return readExcelBySheet(sheet, UtilExcel.maxExcelRowNum, true);
-	}	
-	
-	public static void main(String args[]){
-		//String filepath = "C:\\Users\\root\\Desktop\\千丁-6.27.xlsx";
-		//String filepath = "C:\\Users\\gaoming\\Desktop\\cccc.xls";
-		DecimalFormat df = new DecimalFormat("0.####");
-		 
-		System.out.println(df.format(3.333113F));
-		System.out.println(df.format(3.3));
-		System.out.println(df.format(3.3300));
-		
-		
-		String filepath = "C:\\Users\\EDZ\\Desktop\\詹姆士0623(3)(1).xlsx";
-		List<List<Object>> data = null;
-		
-		try {
-			long start = System.currentTimeMillis();
-			System.out.println(start);
-			Map<String, List<List<Object>>> map = UtilExcel.readExcelAllSheetMap(filepath);
-			long end = System.currentTimeMillis();
-			System.out.println(end);
-			System.out.println((end-start)/1000);
-			
-			
-			//System.out.println(map);
-			data = map.get("0");
-			System.out.println(data);
-			for (int i = 0; i < data.size(); i++) {
-				System.out.println(data.get(i).get(1));
-			}
-//			System.out.println(data.size());
-//			System.out.println(UtilExcel.readExcelAllSheetMap(filepath));
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-//		List<Short> styleList = new ArrayList<Short>();
-//		for(int i=0; i<data.size(); ++i){
-//			if(i == 1)styleList.add(Short.valueOf(HSSFColor.RED.index));
-//			else styleList.add(null);
-//			for(int j=0; j<data.get(i).size(); ++j){
-//				System.out.print(data.get(i).get(j).toString()+" : ");
-//			}
-//			System.out.println("");
-//		}
-//		try {
-//			List<String> headerList = new ArrayList<String>();
-//			headerList.add("shhe1");
-//			headerList.add("shhe2");
-//			List<List<List<Object>>> dataList = new ArrayList<List<List<Object>>>();
-//			List<List<Object>> list1 = new ArrayList<List<Object>>();
-//			List<Object> list11 = new ArrayList<Object>();
-//			list11.add("hahaha");
-//			list11.add("hahaha");
-//			list11.add("hahaha");
-//			list1.add(list11);
-//			
-//			List<List<Object>> list2 = new ArrayList<List<Object>>();
-//			List<Object> list22 = new ArrayList<Object>();
-//			list22.add("hahaha2");
-//			list22.add("hahaha2");
-//			list22.add("hahaha2");
-//			list2.add(list22);
-//			list2.add(list22);
-//			
-//			dataList.add(list1);
-//			dataList.add(list2);
-//			
-//			UtilExcel.saveExcelContailSheet(headerList, dataList, "C:\\Users\\gaoming\\Desktop\\qwer.xls");
-//		} catch (Exception e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-	}
-}
diff --git a/src/test/java/TempExcel.java b/src/test/java/TempExcel.java
deleted file mode 100644
index 1fde7ad..0000000
--- a/src/test/java/TempExcel.java
+++ /dev/null
@@ -1,259 +0,0 @@
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import com.taover.util.UtilExcel;
-
-public class TempExcel {
-	public static void main(String[] args){
-		//checkExcelError();
-		saveExcel();
-	}
-	
-	public static void saveExcel() {
-		List<List<Object>> data = new ArrayList<List<Object>>();
-		data.add(Collections.singletonList(123));
-		data.add(Collections.singletonList(123.222));
-		data.add(Collections.singletonList(1232223234234234L));
-		data.add(Collections.singletonList("123"));
-		data.add(Collections.singletonList("1232223234234234"));
-		data.add(Collections.singletonList(new Date()));
-		try {
-			UtilExcel.saveExcel("data", data, "C:\\Users\\Administrator\\Desktop\\1234.xlsx");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public static void checkExcelError() {
-		List<List<Object>> data = null;
-		try {
-			data = UtilExcel.readExcelAllSheet("C:\\Users\\Administrator\\Desktop\\1234.xls");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		System.out.println("end"+data.get(1).get(10));
-		//dealExcel();
-		//readExcel();
-	}
-	
-	private static void readExcel() {
-		File file = new File("C:\\Users\\Administrator\\Desktop\\异常Excel\\1_2020-03-08-14h55m00s-面包仓-订单回传数据(2)(1).xlsx");
-		try {
-			Map<String, List<List<Object>>> readExcelAllSheetMap = UtilExcel.readExcelAllSheetMap(file.getAbsolutePath());
-			System.out.println("12");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public static final String SEPARATE_CONSIGNEE_MOBILE = "__";
-	public static final int EXCEL_TIANMAO_CONSIGNEE_INDEX = 14;
-	public static final int EXCEL_TIANMAO_MOBILE_INDEX = 18;
-	public static final int EXCEL_TIANMAO_ORDERDATE_INDEX = 20;
-	public static final int EXCEL_TIANMAO_GOODSNUMBER_INDEX = 26;
-	public static final int EXCEL_JD_CONSIGNEE_INDEX = 14;
-	public static final int EXCEL_JD_MOBILE_INDEX = 16;
-	public static final int EXCEL_JD_ORDERDATE_INDEX = 24;
-	public static final int EXCEL_JD_GOODSNUMBER_INDEX = 3;
-	
-	public static void dealExcel(){		
-		try {
-			List<List<Object>> tianmaoData = UtilExcel.readExcel("D:\\tempexcel\\tianmao.xlsx");
-			List<List<Object>> jdData = UtilExcel.readExcel("D:\\tempexcel\\jd.xls");
-			tianmaoData.remove(0);
-			jdData.remove(0);
-			
-			//按下单人及下单手机号分类
-			Map<String, List<List<Object>>> separateData = new HashMap<String, List<List<Object>>>();
-			for(int i=0; i<tianmaoData.size(); ++i){
-				List<Object> tempData = tianmaoData.get(i);
-				injectMap(separateData, getNameAndMobileByTianmao(tempData), tempData);
-			}
-			for(int i=0; i<jdData.size(); ++i){
-				List<Object> tempData = jdData.get(i);
-				injectMap(separateData, getNameAndMobileByJd(tempData), tempData);
-			}
-			
-			//分析下单分类
-			List<SeparateAnalysisInfo> analysisData = new ArrayList<SeparateAnalysisInfo>();
-			Iterator<String> keyIter = separateData.keySet().iterator();
-			while(keyIter.hasNext()){
-				String keyName = keyIter.next();
-				List<List<Object>> keyData = separateData.get(keyName); 
-				if(keyData.size() <= 1){
-					continue;
-				}
-				
-				String[] keyNameSep = keyName.split(TempExcel.SEPARATE_CONSIGNEE_MOBILE);				
-				if(keyNameSep.length == 4){
-					SeparateAnalysisInfo anaInfo = new SeparateAnalysisInfo(keyNameSep[0], keyNameSep[1], keyData, Integer.valueOf(keyNameSep[2]), Integer.valueOf(keyNameSep[3]));
-					if(anaInfo.getDescList().size() > 1){
-						analysisData.add(anaInfo);
-					}
-				}
-			}
-			
-			//打印信息,保存信息
-			List<List<Object>> resultInfo = new ArrayList<List<Object>>();
-			List<Object> blankRow = new ArrayList<Object>();
-			for(int i=0; i<analysisData.size(); ++i){
-				SeparateAnalysisInfo item = analysisData.get(i);
-				
-				//添加空白间距行
-				resultInfo.add(blankRow);
-				resultInfo.add(blankRow);
-				
-				//用户信息列
-				List<Object> userInfo = new ArrayList<Object>();
-				userInfo.add("收货人："+item.getConsignee());
-				userInfo.add("电话号："+item.getMobile());
-				resultInfo.add(userInfo);
-				
-				//下单信息列
-				List<Object> descInfo = new ArrayList<Object>();
-				descInfo.add("下单简述");
-				for(int j=0; j<item.getDescList().size(); ++j){
-					descInfo.add(item.getDescList().get(j));
-				}
-				resultInfo.add(descInfo);
-				
-				//订单详情
-				resultInfo.addAll(item.getOrderData());
-			}
-			UtilExcel.saveExcel("处理结果", resultInfo, "D:\\tempexcel\\resultinfo.xlsx");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public static void injectMap(Map<String, List<List<Object>>> separateData, String keyName, List<Object> keyValue){
-		if(separateData.containsKey(keyName)){
-			separateData.get(keyName).add(keyValue);
-		}else{
-			List<List<Object>> tempData = new ArrayList<List<Object>>();
-			tempData.add(keyValue);
-			separateData.put(keyName, tempData);
-		}
-	}
-	
-	public static String getNameAndMobileByTianmao(List<Object> data){
-		String name = data.get(EXCEL_TIANMAO_CONSIGNEE_INDEX).toString();
-		String mobile = data.get(EXCEL_TIANMAO_MOBILE_INDEX).toString();
-		return name+SEPARATE_CONSIGNEE_MOBILE+mobile+SEPARATE_CONSIGNEE_MOBILE+EXCEL_TIANMAO_ORDERDATE_INDEX+SEPARATE_CONSIGNEE_MOBILE+EXCEL_TIANMAO_GOODSNUMBER_INDEX;
-	}
-	
-	public static String getNameAndMobileByJd(List<Object> data){
-		String name = data.get(EXCEL_JD_CONSIGNEE_INDEX).toString();
-		String mobile = data.get(EXCEL_JD_MOBILE_INDEX).toString();
-		return name+SEPARATE_CONSIGNEE_MOBILE+mobile+SEPARATE_CONSIGNEE_MOBILE+EXCEL_TIANMAO_ORDERDATE_INDEX+SEPARATE_CONSIGNEE_MOBILE+EXCEL_TIANMAO_GOODSNUMBER_INDEX;
-	}
-}
-
-class SeparateAnalysisInfo{
-	private String consignee;
-	private String mobile;
-	private List<String> descList;
-	private List<List<Object>> orderData;
-	
-	public SeparateAnalysisInfo(String consignee, String mobile, List<List<Object>> data, int excelOrderDateIndex, int excelGoodsNumberIndex){
-		this.consignee = consignee;
-		this.mobile = mobile;
-		this.orderData = data;
-		
-		for(int i=0; i<data.size(); ++i){
-			List<Object> dataItem = data.get(i);
-			if(dataItem.get(excelOrderDateIndex) == null){
-				System.out.println("没有下单日期信息："+this.consignee+"__"+this.mobile);
-				continue;
-			}
-			if(dataItem.get(excelGoodsNumberIndex) == null){
-				System.out.println("没有商品数量信息："+this.consignee+"__"+this.mobile);
-				continue;
-			}
-			
-			String orderDate = dataItem.get(excelOrderDateIndex).toString();
-			if(orderDate.contains("-")){
-				orderDate = orderDate.substring(0, 10);
-			}else{
-				String[] dateInfo = orderDate.split(" ");
-				if(dateInfo.length > 0){
-					orderDate = dateInfo[0].replace("/", "-");	
-				}
-			}
-			String goodsNumber = dataItem.get(excelGoodsNumberIndex).toString();
-			this.addDescListItem(orderDate, goodsNumber);
-		}
-	}
-	
-	public String getConsignee() {
-		return consignee;
-	}
-	public void setConsignee(String consignee) {
-		this.consignee = consignee;
-	}
-	public String getMobile() {
-		return mobile;
-	}
-	public void setMobile(String mobile) {
-		this.mobile = mobile;
-	}
-	public List<String> getDescList() {
-		return descList;
-	}
-	public void setDescList(List<String> descList) {
-		this.descList = descList;
-	}
-	
-	public void addDescListItem(String orderDate, String goodsNumber){
-		if(this.descList == null){
-			this.descList = new ArrayList<String>();
-		}
-		String separateStr = "__";
-		
-		//检查是否有重复日期的情况
-		boolean existsDate = false;
-		for(int i=0; i<this.descList.size(); ++i){
-			String tempDesc = this.descList.get(i);
-			if(tempDesc.startsWith(orderDate)){
-				existsDate = true;
-				String[] tempData = tempDesc.split(separateStr);
-				if(tempData.length > 1){
-					String[] tempDataGoods = tempData[1].split("件");
-					if(tempDataGoods.length > 0){
-						try{
-							int totalNumber = Integer.valueOf(tempDataGoods[0]).intValue()+Integer.valueOf(goodsNumber).intValue();
-							this.descList.set(i, orderDate+separateStr+totalNumber+"件");
-						}catch(Exception e){
-							e.printStackTrace();
-						}
-					}
-				}
-				
-				break;
-			}
-		}
-		if(!existsDate){
-			this.descList.add(orderDate+separateStr+goodsNumber+"件");
-		}
-	}
-	
-	public List<List<Object>> getOrderData() {
-		return orderData;
-	}
-	public void setOrderData(List<List<Object>> orderData) {
-		this.orderData = orderData;
-	}
-	
-	public void addOrderDataItem(List<Object> orderData){
-		if(this.orderData == null){
-			this.orderData = new ArrayList<List<Object>>();
-		}
-		this.orderData.add(orderData);
-	}
-}
--
libgit2 0.21.2