导入带图像

src/main/java/com/iden/bms/service/PersonService.java

@@ -300,8 +300,8 @@ public class PersonService {
                             //获取图片格式
                             String ext = pic.getPictureData().suggestFileExtension();
                             logger.info("ext == " + ext);
-                            if(!"jpg".equalsIgnoreCase(ext)){
-                                throw new BDException("Excel中只能放jpg格式图像");
+                            if(!"jpg".equalsIgnoreCase(ext) && !"jpeg".equalsIgnoreCase(ext) && !"png".equalsIgnoreCase(ext) ){
+                                throw new BDException("Excel中只能放jpg或png格式图像");
                             }
 
                             XSSFClientAnchor anchor = pic.getPreferredSize();
@@ -466,7 +466,8 @@ public class PersonService {
                     PictureData picData = picMap.get(i);
                     if(picData != null){
                         //保存的文件名
-                        String saveFileName = DateUtils.getCurrYyyyMMddHHmmssDate() + "_" + UUID.randomUUID().toString()   + ".jpg";
+                        String saveFileName = DateUtils.getCurrYyyyMMddHHmmssDate() + "_" + UUID.randomUUID().toString()   + "." + picData.suggestFileExtension();
+                        logger.info("saveFileName== " + saveFileName);
                         String savePath = idenRoot + "data/final/person/image/" + idenCommunity.getCode() + "/" + saveFileName;
                         // 保存图片
                         savePic(picData,savePath);