ソースを参照

调整spring版本

yuj 7 年 前
コミット
5c7403656f

+ 6 - 10
pom.xml

@@ -125,6 +125,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
+			<version>4.2.8.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -338,19 +339,14 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>3.17</version>
+			<version>3.9</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>3.17</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.poi</groupId>
-					<artifactId>poi</artifactId>
-				</exclusion>
-			</exclusions>
+		<groupId>org.apache.poi</groupId>
+		<artifactId>poi-ooxml</artifactId>
+			<version>3.9</version>
 		</dependency>
+
 		<!-- BeeCloud支付集成SDK -->
 		<dependency>
 			<groupId>cn.beecloud</groupId>

+ 1 - 1
src/main/java/com/uas/platform/b2c/common/weixin/util/HttpReqUtil.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2c.common.weixin.util;
 
 import com.uas.sso.common.util.HttpUtil;
-import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.UnsupportedEncodingException;

+ 83 - 0
src/main/java/com/uas/platform/b2c/core/support/view/JxlsxExcelView.java

@@ -0,0 +1,83 @@
+package com.uas.platform.b2c.core.support.view;
+
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.servlet.view.document.AbstractXlsxView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+
+/**
+ * 利用jxlsx模板生成excel
+ * 
+ * @author yuj
+ * 
+ */
+public class JxlsxExcelView extends AbstractXlsxView {
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+	/**
+	 * 导入.xls格式文件
+	 */
+	private static final String EXTENSION = ".xls";
+
+	/**
+	 *  .xls 表格
+	 */
+	public static final String EXCEL_XLS = "xls";
+
+	/**
+	 * .xlsx 表格
+	 */
+	public static final String EXCEL_XLSX = "xlsx";
+
+	@Override
+	protected void buildExcelDocument(Map<String, Object> map, Workbook workbook, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+/*		if (model == null)
+			map = new HashMap<String, Object>();
+		map.put("export", new Export());
+		XLSTransformer transformer = new XLSTransformer();
+		transformer.transformWorkbook(workbook, map);
+		response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "utf-8") + EXTENSION);*/
+	}
+
+	@Override
+	protected Workbook createWorkbook(Map<String, Object> model, HttpServletRequest request) {
+		Object filePath = model.get("filePath");
+		return super.createWorkbook(model, request);
+	}
+
+	//
+//	public JxlsxExcelView(String tplPath, String fileName) {
+//		super();
+//		setUrl(tplPath);
+//		this.fileName = fileName;
+//	}
+
+	//	@Override
+//	protected HSSFWorkbook getTemplateSource(String url, HttpServletRequest request) throws Exception {
+//		LocalizedResourceHelper helper = new LocalizedResourceHelper(ContextUtils.getApplicationContext());
+//		Locale userLocale = RequestContextUtils.getLocale(request);
+//		Resource inputFile = helper.findLocalizedResource(url, EXTENSION, userLocale);
+//		if (this.logger.isDebugEnabled()) {
+//			this.logger.debug("Loading Excel workbook from " + inputFile);
+//		}
+//		POIFSFileSystem fs = new POIFSFileSystem(inputFile.getInputStream());
+//		return new HSSFWorkbook(fs);
+//	}
+//
+//	@Override
+//	protected void buildExcelDocument(Map<String, Object> map, HSSFWorkbook workbook, HttpServletRequest request,
+//			HttpServletResponse response) throws Exception {
+//		if (map == null)
+//			map = new HashMap<String, Object>();
+//		map.put("export", new Export());
+//		XLSTransformer transformer = new XLSTransformer();
+//		transformer.transformWorkbook(workbook, map);
+//		response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "utf-8") + EXTENSION);
+//	}
+}

+ 4 - 4
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -2238,9 +2238,9 @@ public class ProductServiceImpl implements ProductService {
         if (fromDate == null || toDate == null) {
             //统计所有的未审核的品牌信息
             Map<String, Integer> map = new HashedMap();
-            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
+            Integer productAmout = jdbcTemplate.queryForObject("select count(1) from products p join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;", Integer.class);
             map.put("productAmout", productAmout);
-            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;");
+            Integer productUserAmout = jdbcTemplate.queryForObject("select count(DISTINCT pr_enuu) from products p join product$private pp on p.pr_id = pp.pr_id  where pp.pr_b2cenabled = 1;", Integer.class);
             map.put("productUserAmout", productUserAmout);
             return ResultMap.success(map);
         } else {
@@ -2248,9 +2248,9 @@ public class ProductServiceImpl implements ProductService {
             Date toT = new Date(toDate);
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Map<String, Integer> map = new HashedMap();
-            Integer productAmout = jdbcTemplate.queryForInt("select count(1) from products p join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
+            Integer productAmout = jdbcTemplate.queryForObject("select count(1) from products p join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;", Integer.class);
             map.put("productAmout", productAmout);
-            Integer productUserAmout = jdbcTemplate.queryForInt("select count(DISTINCT pr_enuu) from products p join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;");
+            Integer productUserAmout = jdbcTemplate.queryForObject("select count(DISTINCT pr_enuu) from products p join product$private pp on p.pr_id = pp.pr_id  where pr_create_time < '" + dateFormat.format(toT) + "' and pr_create_time > '" + dateFormat.format(fromT) + "' and pp.pr_b2cenabled = 1;", Integer.class);
             map.put("productUserAmout", productUserAmout);
             return ResultMap.success(map);
         }