update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsCategoryDao.java

@@ -6,6 +6,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface GoodsCategoryDao extends BaseDAO<Integer, GoodsCategory> {
 
@@ -17,4 +18,15 @@ public interface GoodsCategoryDao extends BaseDAO<Integer, GoodsCategory> {
      * @return
      */
     List<GoodsCategory> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum yesOrNoEnum);
+
+    /**
+     * @describe 获取商品分类
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/9/4
+     * @time 14:05
+     * @param :
+     * @return java.util.List<java.util.Map<java.lang.Integer,java.lang.String>>
+     */
+    List<Map<String, Integer>> queryCategotyMap();
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/GoodsDao.java

@@ -34,4 +34,15 @@ public interface GoodsDao extends BaseDAO<Integer, Goods> {
     List<Goods> findGoodsByIds(@Param("ids") String ids);
 
     List<Goods> findTypeGoods(@Param("type") String type);
+
+    /**
+     * @describe 批量新增
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/9/4
+     * @time 14:39
+     * @param goodsList:
+     * @return void
+     */
+    void batchInsert(@Param("goodsList") List<Goods> goodsList);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/GoodsService.java

@@ -4,7 +4,9 @@ import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.common.service.BaseService;
 
 import org.apache.ibatis.annotations.Param;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 public interface GoodsService extends BaseService<Integer, Goods> {
@@ -40,4 +42,14 @@ public interface GoodsService extends BaseService<Integer, Goods> {
      */
     List<Goods> findTypeGoods(String type);
 
+    /**
+     * @describe 商品导入
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/9/4
+     * @time 11:58
+     * @param file:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.Goods>
+     */
+    List<Goods> importGoods(MultipartFile file) throws Exception;
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GoodsServiceImpl.java

@@ -1,20 +1,45 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.ym.mec.biz.dal.dao.GoodsCategoryDao;
 import com.ym.mec.biz.dal.dao.GoodsDao;
 import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.enums.GoodsType;
 import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.UploadFileService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.UploadReturnBean;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.excel.IniFileUtil;
+import com.ym.mec.util.excel.POIUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.PictureData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implements GoodsService {
+	private static final Logger LOGGER = LoggerFactory.getLogger(CourseScheduleTeacherSalaryServiceImpl.class);
 	
 	@Autowired
 	private GoodsDao goodsDao;
+	@Autowired
+	private UploadFileService uploadFileService;
+	@Autowired
+	private GoodsCategoryDao goodsCategoryDao;
 
 	@Override
 	public BaseDAO<Integer, Goods> getDAO() {
@@ -39,4 +64,78 @@ public class GoodsServiceImpl extends BaseServiceImpl<Integer, Goods>  implement
 	public List<Goods> findTypeGoods(String type) {
 		return goodsDao.findTypeGoods(type);
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public List<Goods> importGoods(MultipartFile file) throws Exception {
+		Map<String, List<Map<String, Object>>> sheetsListMap = POIUtil.importExcel(file.getInputStream(), 2, file.getOriginalFilename());
+		InputStream inputStream = new ClassPathResource("columnMapper.ini").getInputStream();
+		Map<String,String> columns = IniFileUtil.readIniFile(inputStream);
+		List<Goods> goodsList = new ArrayList<>();
+		Map<String, Integer> map = MapUtil.convertIntegerMap(goodsCategoryDao.queryCategotyMap());
+		for (String e : sheetsListMap.keySet()) {
+			List<Map<String, Object>> sheet = sheetsListMap.get(e);
+			valueIsNull: for (Map<String, Object> row : sheet) {
+				if (row.size() == 0){
+					continue;
+				}
+				JSONObject objectMap = new JSONObject();
+				for (String s : row.keySet()) {
+					if(!columns.containsKey(s)){
+						continue;
+					}
+					String columnValue = columns.get(s);
+					if(null == row.get(s) || StringUtils.isEmpty(row.get(s).toString())){
+						LOGGER.error("商品导入异常：参数{}不可为空 param:{}",columnValue,objectMap);
+						continue valueIsNull;
+					}
+					if (columnValue.equals("type")) {
+						for (GoodsType goodsType : GoodsType.values()) {
+							if (goodsType.getDesc().equals(row.get(s).toString())) {
+								objectMap.put(columnValue, goodsType);
+								break;
+							}
+						}
+						continue;
+					}
+					if (columnValue.equals("goodsCategoryName")) {
+						Integer integer = map.get(row.get(s));
+						if(integer == null){
+							LOGGER.error("商品导入异常：商品分类解析失败 param:{}",objectMap);
+							continue valueIsNull;
+						}
+						objectMap.put("goodsCategoryId", integer);
+						continue;
+					}
+					if (columnValue.equals("image")) {
+						List<PictureData> pictureDataList = (ArrayList<PictureData>) row.get(s);
+						if(pictureDataList == null || pictureDataList.size() == 0){
+							continue valueIsNull;
+						}
+						PictureData pictureData = pictureDataList.get(0);
+						InputStream in = new ByteArrayInputStream(pictureData.getData());
+						UploadReturnBean bean = uploadFileService.uploadFile(in, pictureData.suggestFileExtension());
+						if (!bean.isStatus()) {
+							LOGGER.error("商品导入异常：上传图片失败 param:{}",objectMap);
+							continue valueIsNull;
+						}
+						objectMap.put(columnValue, bean.getUrl());
+						continue;
+					}
+					objectMap.put(columnValue, row.get(s));
+				}
+				Goods goods = null;
+				try {
+					goods = JSONObject.parseObject(objectMap.toJSONString(),Goods.class);
+					goodsList.add(goods);
+				} catch (Exception ex) {
+					throw new BizException("导入数据出错");
+				}
+			}
+		}
+		if(goodsList.size() != 0){
+			goodsDao.batchInsert(goodsList);
+		}
+		return goodsList;
+	}
 }

mec-biz/src/main/resources/config/mybatis/GoodsCategoryMapper.xml

@@ -105,4 +105,7 @@
     <select id="findByParentId" resultMap="GoodsCategory">
         SELECT * FROM goods_category WHERE parent_id_ = #{parentId} AND del_flag_ = #{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
+    <select id="queryCategotyMap" resultType="java.util.Map">
+        SELECT id_ 'value',name_ 'key' FROM goods_category WHERE del_flag_ = 0
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -56,6 +56,17 @@
         #{isNew,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{isTop,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{memo},#{publishTime},#{complementGoodsIdList},now(),now(),#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{agreeCostPrice})
     </insert>
+    <insert id="batchInsert">
+        INSERT INTO goods
+        (goods_category_id_,name_,brand_,specification_,image_,market_price_,
+        discount_price_,group_purchase_price_,desc_,update_time_,create_time_,type_,agree_cost_price_)
+        VALUES
+        <foreach collection="goodsList" separator="," item="goods">
+            (#{goods.goodsCategoryId},#{goods.name},#{goods.brand},#{goods.specification},#{goods.image},#{goods.marketPrice},
+            #{goods.discountPrice},#{goods.groupPurchasePrice},#{goods.desc},now(),now(),
+            #{goods.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{goods.agreeCostPrice})
+        </foreach>
+    </insert>
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Goods">
         UPDATE goods

mec-common/common-core/src/main/java/com/ym/mec/common/service/BaseService.java

@@ -8,11 +8,20 @@ package com.ym.mec.common.service;
  * @create 2015年7月13日
  */
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.SqlSession;
+import org.springframework.util.CollectionUtils;
 
 public interface BaseService<PK extends Serializable, T> {
 	/**
@@ -70,5 +79,17 @@ public interface BaseService<PK extends Serializable, T> {
 	 * @return
 	 */
 	public int findCount(Map<String, Object> params);
-	
+
+	/**
+	 * @describe 获取columnKey-columnValue集合
+	 * @author Joburgess
+	 * @date 2020.06.23
+	 * @param columnKey: key所对应的列名
+	 * @param columnValue: value所对应的列名
+	 * @param ids: key条件
+	 * @return java.util.List<java.util.Map>
+	 */
+	<K extends List, Y, Z> Map<Y,Z> getMap(String tableName, String columnKey, String columnValue, K ids, Class<Y> keyType, Class<Z> valueType);
+
+
 }

mec-common/common-core/src/main/java/com/ym/mec/common/service/impl/BaseServiceImpl.java

@@ -12,12 +12,18 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.*;
 
 /**
  * SERVICE操作基类
@@ -26,6 +32,9 @@ import java.util.Map;
  */
 public abstract class BaseServiceImpl<PK extends Serializable, T> implements BaseService<PK, T> {
 
+	@Autowired
+	protected SqlSessionFactory sqlSessionFactory;
+
 	public abstract BaseDAO<PK, T> getDAO();
 
 	/**
@@ -106,4 +115,53 @@ public abstract class BaseServiceImpl<PK extends Serializable, T> implements Bas
 	public int findCount(Map<String, Object> params) {
 		return this.getDAO().queryCount(params);
 	}
+
+
+	@Override
+	public <K extends List, Y, Z> Map<Y,Z> getMap(String tableName, String columnKey, String columnValue, K ids, Class<Y> keyType, Class<Z> valueType){
+		if(CollectionUtils.isEmpty(ids)){
+			return Collections.emptyMap();
+		}
+		StringBuffer sql=new StringBuffer();
+		Map<Y,Z> result=new HashMap();
+		try {
+			SqlSession sqlSession = sqlSessionFactory.openSession();
+			Connection connection = sqlSession.getConnection();
+			sql.append("SELECT ").append(columnKey).append(",").append(columnValue).append(" FROM ").append(tableName).append(" WHERE ").append(columnKey).append(" IN (").append(StringUtils.join(ids, ",")).append(")");
+			PreparedStatement ps = connection.prepareStatement(sql.toString());
+			ResultSet resultSet = ps.executeQuery();
+			while (resultSet.next()){
+				Y key;
+				Z value;
+				if(keyType.isAssignableFrom(BigDecimal.class)){
+					key = (Y) BigDecimal.class.getDeclaredConstructor(String.class).newInstance(resultSet.getString(1));
+				}else if(keyType.isAssignableFrom(String.class)){
+					key = (Y) resultSet.getString(1);
+				}else{
+					key = (Y) keyType.getMethod("valueOf", String.class).invoke(null,resultSet.getString(1));
+				}
+				if(valueType.isAssignableFrom(BigDecimal.class)){
+					value = (Z) BigDecimal.class.getDeclaredConstructor(String.class).newInstance(resultSet.getString(2));
+				}else if(valueType.isAssignableFrom(String.class)){
+					value = (Z) resultSet.getString(2);
+				}else{
+					value = (Z) valueType.getMethod("valueOf", String.class).invoke(null,resultSet.getString(2));
+				}
+				result.put(key, value);
+			}
+			if(resultSet!=null){
+				resultSet.close();
+			}
+			if(ps!=null){
+				ps.close();
+			}
+			if(sqlSession!=null){
+				sqlSession.close();
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return result;
+	}
 }

mec-util/pom.xml

@@ -79,5 +79,10 @@
 			<artifactId>iTextAsian</artifactId>
 			<version>1.0</version>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.ini4j</groupId>
+            <artifactId>ini4j</artifactId>
+            <version>0.5.4</version>
+        </dependency>
+    </dependencies>
 </project>

mec-util/src/main/java/com/ym/mec/util/excel/POIUtil.java

@@ -1,5 +1,18 @@
 package com.ym.mec.util.excel;
 
+import com.ym.mec.util.exception.UtilException;
+import org.apache.commons.beanutils.NestedNullException;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.POIXMLDocumentPart;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.*;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -7,36 +20,9 @@ import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
-import org.apache.commons.beanutils.NestedNullException;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-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.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.IndexedColors;
-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.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.ym.mec.util.exception.UtilException;
-
 public class POIUtil {
 
 	private final static Logger LOGGER = LoggerFactory.getLogger(POIUtil.class);
@@ -48,10 +34,11 @@ public class POIUtil {
 
 	/**
 	 * 将数据集dataset导出到fileName文件中(只支持.xlsx格式)
+	 *
 	 * @param headColumns 导出文件的列名
-	 * @param dataset 数据源
+	 * @param dataset     数据源
 	 * @return
-	 * @throws IOException 
+	 * @throws IOException
 	 */
 	public static SXSSFWorkbook exportBigExcel(String[] headColumns, List<Map<String, Object>> dataset) throws IOException {
 		if (headColumns == null) {
@@ -105,10 +92,11 @@ public class POIUtil {
 
 	/**
 	 * 将数据集dataset导出到fileName文件中
+	 *
 	 * @param headColumns 导出文件的列名
-	 * @param dataset 数据源
+	 * @param dataset     数据源
 	 * @return
-	 * @throws IOException 
+	 * @throws IOException
 	 */
 	public static HSSFWorkbook exportExcel(String[] headColumns, List<Map<String, Object>> dataset) throws IOException {
 		if (headColumns == null) {
@@ -165,14 +153,15 @@ public class POIUtil {
 
 	/**
 	 * 将数据集dataset导出到fileName文件中
-	 * @param headColumns 导出文件的列名
-	 * @param fieldColumns 
-	 * @param dataset 数据源
+	 *
+	 * @param headColumns  导出文件的列名
+	 * @param fieldColumns
+	 * @param dataset      数据源
 	 * @return
-	 * @throws IOException 
-	 * @throws NoSuchMethodException 
-	 * @throws InvocationTargetException 
-	 * @throws IllegalAccessException 
+	 * @throws IOException
+	 * @throws NoSuchMethodException
+	 * @throws InvocationTargetException
+	 * @throws IllegalAccessException
 	 */
 	public static <T> HSSFWorkbook exportExcel(String[] headColumns, String[] fieldColumns, List<T> dataset) throws IOException, IllegalAccessException,
 			InvocationTargetException, NoSuchMethodException {
@@ -243,14 +232,15 @@ public class POIUtil {
 
 	/**
 	 * 将数据集dataset导出到fileName文件中(只支持.xlsx格式)
-	 * @param headColumns 导出文件的列名
-	 * @param fieldColumns 
-	 * @param dataset 数据源
+	 *
+	 * @param headColumns  导出文件的列名
+	 * @param fieldColumns
+	 * @param dataset      数据源
 	 * @return
-	 * @throws IOException 
-	 * @throws NoSuchMethodException 
-	 * @throws InvocationTargetException 
-	 * @throws IllegalAccessException 
+	 * @throws IOException
+	 * @throws NoSuchMethodException
+	 * @throws InvocationTargetException
+	 * @throws IllegalAccessException
 	 */
 	public static <T> SXSSFWorkbook exportBigExcel(String[] headColumns, String[] fieldColumns, List<T> dataset) throws IOException, IllegalAccessException,
 			InvocationTargetException, NoSuchMethodException {
@@ -318,7 +308,8 @@ public class POIUtil {
 
 	/**
 	 * 导入指定的excel文件
-	 * @param excelFile excel文件
+	 *
+	 * @param excelFile   excel文件
 	 * @param startRowNum 从第几行数据开始导入
 	 * @return
 	 * @throws IOException
@@ -428,9 +419,10 @@ public class POIUtil {
 
 	/**
 	 * 导入指定的excel文件
+	 *
 	 * @param inputStream excel文件流
 	 * @param startRowNum 从第几行数据开始导入
-	 * @param extName 文件扩展名，仅支持.xls 或 .xlsx
+	 * @param extName     文件扩展名，仅支持.xls 或 .xlsx
 	 * @return
 	 * @throws IOException
 	 */
@@ -441,10 +433,10 @@ public class POIUtil {
 		Workbook workbook = null;
 
 		try {
-			if (".xlsx".equals(extName.toLowerCase())) {
+			if (extName.endsWith(".xlsx")) {
 				// 支持excel2007 xlsx格式
 				workbook = new XSSFWorkbook(inputStream);
-			} else if (".xls".equals(extName)) {
+			} else if (extName.endsWith(".xls")) {
 				// 支持excel2003以前 xls格式
 				workbook = new HSSFWorkbook(inputStream);
 			} else {
@@ -474,10 +466,19 @@ public class POIUtil {
 			currentRowNum = 0;
 			// 顺序取sheet
 			sheet = workbook.getSheetAt(i);
+
+			Map<String, List<PictureData>> picMap = null;
+			if (extName.endsWith(".xlsx")) {
+				picMap = getXlsxPictures((XSSFSheet) sheet);
+			} else if (extName.endsWith(".xls")) {
+				picMap = getXlsPictures((HSSFSheet) sheet);
+			}
+
 			List<Map<String, Object>> datas = new ArrayList<Map<String, Object>>();
 			rowIter = sheet.iterator();
 			while (rowIter.hasNext()) {
 				Map<String, Object> obj = null;
+				boolean hasVal = false;
 				// 获取当前行
 				row = rowIter.next();
 				if (row != null) {
@@ -509,15 +510,33 @@ public class POIUtil {
 					currentCellNum = 0;
 					while (cellIter.hasNext()) {
 						cell = cellIter.next();
+						int columnIndex = cell.getColumnIndex();
 						cell.setCellType(Cell.CELL_TYPE_STRING);
-						String fieldValue = cell.getStringCellValue();
+						String fieldValue = "";
+						if (columnIndex == currentCellNum) {
+							fieldValue = cell.getStringCellValue();
+						}
+						if (StringUtils.isNotBlank(fieldValue)) {
+							hasVal = true;
+						}
 						obj.put(fieldsName[currentCellNum], fieldValue);
 						currentCellNum++;
 					}
 				}
-				if (obj != null)
-					datas.add(obj);
 
+				if (picMap != null) {
+					for (Entry<String, List<PictureData>> pics : picMap.entrySet()) {
+						String key = pics.getKey();
+						String[] split = key.split("-");
+						int rowIndex = Integer.parseInt(split[0]);
+						int cellIndex = Integer.parseInt(split[1]);
+						if (rowIndex != (currentRowNum - 1)) continue;
+						obj.put(fieldsName[cellIndex], pics.getValue());
+					}
+				}
+
+				if (obj != null && hasVal)
+					datas.add(obj);
 			}
 			if (!datas.isEmpty())
 				result.put(sheet.getSheetName(), datas);
@@ -614,4 +633,72 @@ public class POIUtil {
 		return list;
 	}
 
+	/**
+	 * 获取图片和位置 (xls)
+	 *
+	 * @param sheet
+	 * @return
+	 * @throws IOException
+	 */
+	public static Map<String, List<PictureData>> getXlsPictures(HSSFSheet sheet) throws IOException {
+		Map<String, List<PictureData>> map = new HashMap<>();
+		if (sheet.getDrawingPatriarch() == null || sheet.getDrawingPatriarch().getChildren() == null) {
+			return map;
+		}
+		List<HSSFShape> list = sheet.getDrawingPatriarch().getChildren();
+		for (HSSFShape shape : list) {
+			if (shape instanceof HSSFPicture) {
+				HSSFPicture picture = (HSSFPicture) shape;
+				HSSFClientAnchor cAnchor = (HSSFClientAnchor) picture.getAnchor();
+				PictureData pdata = picture.getPictureData();
+				String key = cAnchor.getRow1() + "-" + cAnchor.getCol1(); // 行号-列号
+				if (map.containsKey(key)) {
+					List<PictureData> pics = map.get(key);
+					pics.add(pdata);
+					map.put(key, pics);
+				} else {
+					List<PictureData> pics = new ArrayList<>();
+					pics.add(pdata);
+					map.put(key, pics);
+				}
+			}
+		}
+		return map;
+	}
+
+	/**
+	 * 获取图片和位置 (xlsx)
+	 *
+	 * @param sheet
+	 * @return
+	 * @throws IOException
+	 */
+	public static Map<String, List<PictureData>> getXlsxPictures(XSSFSheet sheet) throws IOException {
+		Map<String, List<PictureData>> map = new HashMap<>();
+		List<POIXMLDocumentPart> list = sheet.getRelations();
+		for (POIXMLDocumentPart part : list) {
+			if (part instanceof XSSFDrawing) {
+				XSSFDrawing drawing = (XSSFDrawing) part;
+				List<XSSFShape> shapes = drawing.getShapes();
+				for (XSSFShape shape : shapes) {
+					XSSFPicture picture = (XSSFPicture) shape;
+					XSSFClientAnchor anchor = picture.getPreferredSize();
+					CTMarker marker = anchor.getFrom();
+					String key = marker.getRow() + "-" + marker.getCol();
+
+					if (map.containsKey(key)) {
+						List<PictureData> pics = map.get(key);
+						pics.add(picture.getPictureData());
+						map.put(key, pics);
+					} else {
+						List<PictureData> pics = new ArrayList<>();
+						pics.add(picture.getPictureData());
+						map.put(key, pics);
+					}
+				}
+			}
+		}
+		return map;
+	}
+
 }

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.util.collection.MapUtil;
@@ -18,16 +19,17 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.util.*;

pom.xml

@@ -330,6 +330,8 @@
 						<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
 						<nonFilteredFileExtension>ttc</nonFilteredFileExtension>
 						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+						<nonFilteredFileExtension>xls</nonFilteredFileExtension>
+						<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
 					</nonFilteredFileExtensions>
 				</configuration>
 			</plugin>