POI版本升级

pom.xml

@@ -374,7 +374,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>3.14</version>
+			<version>3.17</version>
 		</dependency>
 
 		<dependency>

watero-common-tool/src/main/java/com/iamberry/wechat/tools/ObjectExcelView.java

@@ -12,6 +12,8 @@ import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFFont;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.springframework.web.servlet.view.document.AbstractExcelView;
 
 /**
@@ -53,10 +55,10 @@ public class ObjectExcelView extends AbstractExcelView{
 		
 		// 标题样式
 		HSSFCellStyle headerStyle = workbook.createCellStyle();
-		headerStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
-		headerStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
+		headerStyle.setAlignment(HorizontalAlignment.CENTER);
+		headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
 		HSSFFont headerFont = workbook.createFont();	//标题字体
-		headerFont.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
+		headerFont.setBold(true);
 		headerFont.setFontHeightInPoints((short)11);
 		headerStyle.setFont(headerFont);
 		short width = 20,height=25*20;
@@ -74,7 +76,7 @@ public class ObjectExcelView extends AbstractExcelView{
 		
 		//内容样式
 		HSSFCellStyle contentStyle = workbook.createCellStyle();
-		contentStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+		contentStyle.setAlignment(HorizontalAlignment.CENTER);
 		
 		// 设置内容
 		List<List<Object>> varList = (List<List<Object>>) model.get("varList");

watero-rst-web/pom.xml

@@ -84,12 +84,12 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.14</version>
+            <version>3.17</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-schemas</artifactId>
-            <version>3.14</version>
+            <version>3.17</version>
         </dependency>
 
         <!-- ueditor -->

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -36,6 +36,8 @@ import net.sf.json.JSONObject;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -1993,7 +1995,7 @@ public class AdminCustomerController {
                     SimpleDateFormat sdf3=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     cycleOnes = cycleOne * customerList.size();
                     //修改预计下载完成时间
-                    downloadProgressInfo.setDownloadDate(sdf3.format(new Date().getTime()+cycleOnes));
+                    downloadProgressInfo.setDownloadDate(sdf3.format(System.currentTimeMillis()+cycleOnes));
                     downloadProgressInfo.setDownloadProgress(result);
                     customerService.updateDownloadProgressInfo(downloadProgressInfo);
                 }else{
@@ -2030,7 +2032,7 @@ public class AdminCustomerController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
         //设置表头
 
         if (cells == null || cells.length == 0) {
@@ -2866,7 +2868,7 @@ public class AdminCustomerController {
                 SimpleDateFormat sdf3=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 cycleOnes = cycleOne * customerList.size();
                 //修改预计下载完成时间
-                downloadProgressInfo.setDownloadDate(sdf3.format(new Date().getTime()+cycleOnes));
+                downloadProgressInfo.setDownloadDate(sdf3.format(System.currentTimeMillis()+cycleOnes));
                 downloadProgressInfo.setDownloadProgress(result);
                 customerService.updateDownloadProgressInfo(downloadProgressInfo);
             }
@@ -2898,8 +2900,8 @@ public class AdminCustomerController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
-        style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 上下居中
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);// 上下居中
         //设置表头
 
         if (cells == null || cells.length == 0) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -24,6 +24,7 @@ import com.iamberry.rst.util.GenerateKeyUtil;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -848,7 +849,7 @@ public class AdminDetectController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
         //设置表头
 
         if (cells == null || cells.length == 0) {
@@ -1084,7 +1085,7 @@ public class AdminDetectController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
         //设置表头
 
         if (cells == null || cells.length == 0) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminPostageController.java

@@ -12,6 +12,7 @@ import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -478,7 +479,7 @@ public class AdminPostageController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
         //设置表头
 
         if (cells == null || cells.length == 0) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -25,6 +25,7 @@ import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -576,7 +577,7 @@ public class AdminSignclosedController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
         //设置表头
 
         if (cells == null || cells.length == 0) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -35,6 +35,7 @@ import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -314,7 +315,7 @@ public class AdminSalesOrderController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
         //设置表头
 
         if (cells == null || cells.length == 0) {
@@ -542,7 +543,7 @@ public class AdminSalesOrderController {
         //创建单元格，设置值表头，设置表头居中
         HSSFCellStyle style = wb.createCellStyle();
         //居中格式
-        style.setAlignment(HSSFCellStyle.ALIGN_CENTER);
+        style.setAlignment(HorizontalAlignment.CENTER);
         //设置表头
 
         if (cells == null || cells.length == 0) {

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -471,7 +471,7 @@ public class ExcelUtil {
         // 样式
         HSSFCellStyle cellStyle = (HSSFCellStyle) wb.createCellStyle();
         cellStyle.setFillForegroundColor(IndexedColors.RED.getIndex());
-        cellStyle.setFillPattern(CellStyle.SOLID_FOREGROUND);
+        cellStyle.setFillPattern(FillPatternType.NO_FILL);
 
         EfastOrder remmendOrder = new EfastOrder();